summaryrefslogtreecommitdiff
path: root/src/coreclr
diff options
context:
space:
mode:
Diffstat (limited to 'src/coreclr')
-rw-r--r--src/coreclr/dirs.proj25
-rw-r--r--src/coreclr/hosts/coreconsole/CoreConsole.nativeproj32
-rw-r--r--src/coreclr/hosts/corerun/coreRun.nativeproj45
-rw-r--r--src/coreclr/hosts/dirs.proj19
-rw-r--r--src/coreclr/hosts/unixcoreconsole/CMakeLists.txt9
-rw-r--r--src/coreclr/hosts/unixcorerun/CMakeLists.txt10
-rw-r--r--src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp8
7 files changed, 21 insertions, 127 deletions
diff --git a/src/coreclr/dirs.proj b/src/coreclr/dirs.proj
deleted file mode 100644
index 6b14c1aff2..0000000000
--- a/src/coreclr/dirs.proj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(FeatureCoreClr)' == 'true'">
- <ProjectFile Include="batchsetup\batchsetup.proj" />
- <ProjectFile Include="hosts\dirs.proj" />
- <ProjectFile Include="snskipverf\snskipverf.nativeproj" />
- <ProjectFile Include="release\release.proj" />
- <ProjectFile Include="uwp\dirs.proj" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(FeatureCoreSystem)' == 'true'">
- <ProjectFile Include="shim\dirs.proj" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/coreclr/hosts/coreconsole/CoreConsole.nativeproj b/src/coreclr/hosts/coreconsole/CoreConsole.nativeproj
deleted file mode 100644
index bdb190fbbb..0000000000
--- a/src/coreclr/hosts/coreconsole/CoreConsole.nativeproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <!--Leaf project Properties-->
- <PropertyGroup>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- <OutputName>CoreConsole</OutputName>
- <TargetType>PROGRAM</TargetType>
- <LinkSubsystem>console</LinkSubsystem>
- <EntryPoint>wmain</EntryPoint>
- <ClAdditionalOptions>$(ClAdditionalOptions) -DUNICODE -D_UNICODE</ClAdditionalOptions>
- <IsTestNetHost>true</IsTestNetHost>
- </PropertyGroup>
-
- <ItemGroup>
- <TargetLib Include="$(CoreSystemCrt)" />
- <TargetLib Condition="'$(BuildForWindows7)'=='true'" Include="$(SdkLibPath)\mincore_fw.lib" />
- <TargetLib Condition="'$(BuildForWindows7)'!='true'" Include="$(SdkLibPath)\mincore.lib" />
- </ItemGroup>
-
- <ItemGroup>
- <RCResourceFile Include="native.rc" />
- </ItemGroup>
- <ItemGroup>
- <CppCompile Include="coreconsole.cpp" />
- <CppCompile Include="logger.cpp" />
- </ItemGroup>
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-</Project>
diff --git a/src/coreclr/hosts/corerun/coreRun.nativeproj b/src/coreclr/hosts/corerun/coreRun.nativeproj
deleted file mode 100644
index 87b64a5408..0000000000
--- a/src/coreclr/hosts/corerun/coreRun.nativeproj
+++ /dev/null
@@ -1,45 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="dogfood">
- <!--*****************************************************-->
- <!--This MSBuild project file was automatically generated-->
- <!--from the original SOURCES/DIRS file by the KBC tool.-->
- <!--*****************************************************-->
- <!--Import the settings-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <!--Leaf project Properties-->
- <PropertyGroup>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- <OutputName>CoreRun</OutputName>
- <TargetType>PROGRAM</TargetType>
- <LinkSubsystem>console</LinkSubsystem>
- <EntryPoint>wmain</EntryPoint>
- <ClAdditionalOptions>$(ClAdditionalOptions) -DUNICODE -D_UNICODE</ClAdditionalOptions>
- <IsTestNetHost>true</IsTestNetHost>
- </PropertyGroup>
-
- <ItemGroup>
- <LinkPreCrtLibs Include="$(ClrLibPath)\utilcodestaticnohost.lib" />
- <ProjectReference Include="$(ClrSrcDirectory)utilcode\staticnohost\staticnohost.nativeproj" />
- </ItemGroup>
- <ItemGroup>
- <TargetLib Include="$(CoreSystemCrt)" />
- <TargetLib Condition="'$(BuildForWindows7)'=='true'" Include="$(SdkLibPath)\mincore_fw.lib" />
- <TargetLib Condition="'$(BuildForWindows7)'=='true'" Include="$(SdkLibPath)\oleaut32.lib" />
- <TargetLib Condition="'$(BuildForWindows7)'!='true'" Include="$(SdkLibPath)\mincore.lib" />
- <TargetLib Condition="'$(BuildForWindows7)'!='true'" Include="$(SdkLibPath)\mincore_legacy.lib" />
- <TargetLib Condition="'$(BuildForWindows7)'!='true'" Include="$(SdkLibPath)\mincore_private.lib" />
- <TargetLib Condition="'$(BuildForWindows7)'!='true'" Include="$(SdkLibPath)\mincore_obsolete.lib" />
- <TargetLib Include="$(SdkLibPath)\uuid.lib" />
- </ItemGroup>
-
- <ItemGroup>
- <RCResourceFile Include="native.rc" />
- </ItemGroup>
- <ItemGroup>
- <CppCompile Include="coreRun.cpp" />
- <CppCompile Include="logger.cpp" />
- </ItemGroup>
- <!--Import the targets-->
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
-</Project>
diff --git a/src/coreclr/hosts/dirs.proj b/src/coreclr/hosts/dirs.proj
deleted file mode 100644
index 11382958cb..0000000000
--- a/src/coreclr/hosts/dirs.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.props" />
-
- <PropertyGroup>
- <BuildInPhase1>true</BuildInPhase1>
- <BuildInPhaseDefault>false</BuildInPhaseDefault>
- <BuildCoreBinaries>true</BuildCoreBinaries>
- <BuildSysBinaries>true</BuildSysBinaries>
- </PropertyGroup>
-
- <!--The following projects will build during PHASE 1-->
- <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(FeatureCoreClr)' == 'true'">
- <ProjectFile Include="coreRun\coreRun.nativeproj" />
- <ProjectFile Include="fxprun\fxprun.nativeproj" />
- <ProjectFile Include="coreconsole\CoreConsole.nativeproj" />
- </ItemGroup>
-
- <Import Project="$(_NTDRIVE)$(_NTROOT)\tools\Microsoft.DevDiv.Traversal.targets" />
-</Project>
diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt
index 8988e60dcf..94587b5374 100644
--- a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt
+++ b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt
@@ -23,11 +23,16 @@ endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL
# pthread by the process executable ensures that all locks are initialized properly.
target_link_libraries(coreconsole
unixcoreruncommon
- pthread
)
+if(NOT CLR_CMAKE_PLATFORM_ANDROID)
+ target_link_libraries(coreconsole
+ pthread
+ )
+endif()
+
add_dependencies(coreconsole
coreclr
)
-install_clr(coreconsole) \ No newline at end of file
+install_clr(coreconsole)
diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt
index b32c9833bf..b5dc730aaf 100644
--- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt
+++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt
@@ -23,11 +23,17 @@ endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL
# pthread by the process executable ensures that all locks are initialized properly.
target_link_libraries(corerun
unixcoreruncommon
- pthread
)
+# Android implements pthread natively
+if(NOT CLR_CMAKE_PLATFORM_ANDROID)
+ target_link_libraries(corerun
+ pthread
+ )
+endif()
+
add_dependencies(corerun
coreclr
)
-install_clr(corerun) \ No newline at end of file
+install_clr(corerun)
diff --git a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
index d7186d7a29..5ac7654780 100644
--- a/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
+++ b/src/coreclr/hosts/unixcoreruncommon/coreruncommon.cpp
@@ -313,6 +313,7 @@ int ExecuteManagedAssembly(
std::string appPath;
GetDirectory(managedAssemblyAbsolutePath, appPath);
+ std::string tpaList;
// Construct native search directory paths
std::string nativeDllSearchDirs(appPath);
char *coreLibraries = getenv("CORE_LIBRARIES");
@@ -320,11 +321,14 @@ int ExecuteManagedAssembly(
{
nativeDllSearchDirs.append(":");
nativeDllSearchDirs.append(coreLibraries);
+ if (std::strcmp(coreLibraries, clrFilesAbsolutePath) != 0)
+ {
+ AddFilesFromDirectoryToTpaList(coreLibraries, tpaList);
+ }
}
nativeDllSearchDirs.append(":");
nativeDllSearchDirs.append(clrFilesAbsolutePath);
- std::string tpaList;
AddFilesFromDirectoryToTpaList(clrFilesAbsolutePath, tpaList);
void* coreclrLib = dlopen(coreClrDllPath.c_str(), RTLD_NOW | RTLD_LOCAL);
@@ -443,7 +447,7 @@ int ExecuteManagedAssembly(
}
else
{
- char* error = dlerror();
+ const char* error = dlerror();
fprintf(stderr, "dlopen failed to open the libcoreclr.so with error %s\n", error);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 12:19:35 +0000