diff options
| author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2016-12-23 22:18:32 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-12-23 14:18:32 +0100 |
| commit | 5ef3df8ffe059d5f91c6bae09d8f95a0332f1363 (patch) | |
| tree | ca1984151b6f044658d0302f48b6cfecb3521edf /CMakeLists.txt | |
| parent | 55ea631f84ba1e9084f12b95a43135b526169cd9 (diff) | |
| download | coreclr-5ef3df8ffe059d5f91c6bae09d8f95a0332f1363.tar.gz coreclr-5ef3df8ffe059d5f91c6bae09d8f95a0332f1363.tar.bz2 coreclr-5ef3df8ffe059d5f91c6bae09d8f95a0332f1363.zip | |
[Linux] Fix cross-architecture component build configuration for ARM32-target (#8687)
* fix CMakeLists.txt for palrt
* Modify CMakeLists.txt for cross-architecture component configuaration
Add coreclrpal project to fix a dependency issue when CMake configuration
* Allow only x64-host/arm-target for linux
allow x64-host/arm-target only, because pal is not stable for x86 now
* Update build.sh
delete NumProc=1 (inserted for debugging)
* Change x64-host to x86-host for arm-target
JIT correctness problem,
and fix CMake configuration for x86 in pal
* Fix type
* Update CMakeLists.txt
* fix style
* Set x86 when arm-target/x64-host
* fix typo
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61c689b6d0..2c39780e29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,7 +129,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(CLR_CMAKE_PLATFORM_UNIX 1) if(CLR_CROSS_COMPONENTS_BUILD) # CMAKE_HOST_SYSTEM_PROCESSOR returns the value of `uname -p` on host. - if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) + if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL amd64) if(CLR_CMAKE_TARGET_ARCH STREQUAL "arm") set(CLR_CMAKE_PLATFORM_UNIX_X86 1) else() @@ -549,12 +549,10 @@ if(CLR_CMAKE_PLATFORM_UNIX) endif(CLR_CMAKE_PLATFORM_UNIX) if(CLR_CMAKE_PLATFORM_UNIX) - add_subdirectory(src/ToolBox/SOS/lldbplugin) - if(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + add_subdirectory(src/ToolBox/SOS/lldbplugin) add_subdirectory(src/pal) - endif(NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) - add_subdirectory(src/coreclr/hosts) - add_subdirectory(src/ildasm/unixcoreclrloader) + add_subdirectory(src/coreclr/hosts) + add_subdirectory(src/ildasm/unixcoreclrloader) endif(CLR_CMAKE_PLATFORM_UNIX) # Add this subdir. We install the headers for the jit. |