diff options
| author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2017-03-29 17:28:57 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-03-29 10:28:57 +0200 |
| commit | 1c4fda612e8a4f0d48346c477d058fa3fddf514e (patch) | |
| tree | e5f8c1dcbd7d4424a0a05a917b976e9514c0cd2b | |
| parent | a1ad1592f45bdfc544deedb1d2e88e9a35895bb1 (diff) | |
| download | coreclr-1c4fda612e8a4f0d48346c477d058fa3fddf514e.tar.gz coreclr-1c4fda612e8a4f0d48346c477d058fa3fddf514e.tar.bz2 coreclr-1c4fda612e8a4f0d48346c477d058fa3fddf514e.zip | |
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
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/coreclr/hosts/unixcoreconsole/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/coreclr/hosts/unixcorerun/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/debug/daccess/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dlls/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 4 |
6 files changed, 8 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b3714324ce..c60fa26424 100644 --- 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 94587b5374..2daeaabfa3 100644 --- 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 b5dc730aaf..07beaae1df 100644 --- 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 c06e94662d..aab3f81ac6 100644 --- 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 6d036aff66..932e65e350 100644 --- 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 f2514d2c0a..3144b5139f 100644 --- 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) |