Fix dependency to coreclr and mscorrc in Linux (#10138)

* Fix dependency to coreclr and mscorrc in Linux

Remove dependency with coreclr in some projects for Linux
Recover build mscorrc for cross architecture in Linux

* Fix CMakeLists.txt in src/dlls

minimize uses of CLR_CROSS_COMPONENTS_BUILD flag in CMakeLists.txt

Modify root/CMakeLists.txt to exclude corerun and coreconsole build
during cross component build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b371432..c60fa26 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -542,7 +542,7 @@ include(pgosupport.cmake)
 #     - do not depend on clr's compile definitions
 #-----------------------------------------
 if(CLR_CMAKE_PLATFORM_UNIX AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
-  add_subdirectory(src/corefx)
+    add_subdirectory(src/corefx)
 endif()
 
 if(CLR_CMAKE_PLATFORM_UNIX)

diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt
index 94587b5..2daeaab 100644 (file)
--- a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt
+++ b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt
@@ -31,8 +31,4 @@ if(NOT CLR_CMAKE_PLATFORM_ANDROID)
   )
 endif()
 
-add_dependencies(coreconsole
-    coreclr
-)
-
 install_clr(coreconsole)

diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt
index b5dc730..07beaae 100644 (file)
--- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt
+++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt
@@ -32,8 +32,4 @@ if(NOT CLR_CMAKE_PLATFORM_ANDROID)
   )
 endif()
 
-add_dependencies(corerun
-    coreclr
-)
-
 install_clr(corerun)

diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt
index c06e946..aab3f81 100644 (file)
--- a/src/debug/daccess/CMakeLists.txt
+++ b/src/debug/daccess/CMakeLists.txt
@@ -62,5 +62,5 @@ if(CLR_CMAKE_PLATFORM_UNIX)
     DEPENDS ${GENERATED_INCLUDE_DIR}/dactablerva.h
   )
 
-  add_dependencies(daccess coreclr dactablerva_header)
+  add_dependencies(daccess dactablerva_header)
 endif(CLR_CMAKE_PLATFORM_UNIX)

diff --git a/src/dlls/CMakeLists.txt b/src/dlls/CMakeLists.txt
index 6d036af..932e65e 100644 (file)
--- a/src/dlls/CMakeLists.txt
+++ b/src/dlls/CMakeLists.txt
@@ -4,8 +4,6 @@ endif(WIN32)
 add_subdirectory(dbgshim)
 add_subdirectory(mscordbi)
 add_subdirectory(mscordac)
-if (NOT CLR_CROSS_COMPONENTS_BUILD)
-  add_subdirectory(mscoree)
-  add_subdirectory(mscorpe)
-  add_subdirectory(mscorrc)
-endif()
+add_subdirectory(mscoree)
+add_subdirectory(mscorpe)
+add_subdirectory(mscorrc)

diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt
index f2514d2..3144b51 100644 (file)
--- a/src/dlls/mscoree/coreclr/CMakeLists.txt
+++ b/src/dlls/mscoree/coreclr/CMakeLists.txt
@@ -171,7 +171,9 @@ if(WIN32)
         COMMENT Add dactable, debug resources, and dump helper resources to coreclr
     )
 
-    add_custom_target(inject_debug_resources ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/inject_debug_resources.timestamp)
+    if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD)
+        add_custom_target(inject_debug_resources ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/inject_debug_resources.timestamp)
+    endif()
 
 endif(WIN32)