diff options
| author | Hyeongseok Oh <hseok82.oh@samsung.com> | 2017-04-04 21:07:09 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-04-04 14:07:09 +0200 |
| commit | dfce3af2ee5967ae53c7b47135f150f59452ded3 (patch) | |
| tree | bb512f72dcc967d9fddb926a31074822060e8d5c /CMakeLists.txt | |
| parent | 53c88123a7f6216a31318f14062fd245730c74ba (diff) | |
| download | coreclr-dfce3af2ee5967ae53c7b47135f150f59452ded3.tar.gz coreclr-dfce3af2ee5967ae53c7b47135f150f59452ded3.tar.bz2 coreclr-dfce3af2ee5967ae53c7b47135f150f59452ded3.zip | |
Pass crossbuild and linux-id to CMakeLists.txt using CMake arguments (#10686)
Remove in CMakeLists.txt
1) read cross-build from environment variable
2) read linux-id from file system
Instead, pass cross-build and linux-id from gen-buildsys-clang.sh using cmake arguments
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6327a143f8..66b0255472 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ else (WIN32) else (CMAKE_SYSTEM_NAME STREQUAL Darwin) # Ensure that objcopy is present - if (DEFINED ENV{CROSSCOMPILE} AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) + if (CLR_UNIX_CROSS_BUILD AND NOT DEFINED CLR_CROSS_COMPONENTS_BUILD) if (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm) find_program(OBJCOPY ${TOOLCHAIN}-objcopy) elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686) @@ -164,15 +164,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) endif() set(CLR_CMAKE_PLATFORM_LINUX 1) - # Detect Alpine Linux - SET(OS_RELEASE_FILENAME "/etc/os-release") - if (EXISTS ${OS_RELEASE_FILENAME}) - file(READ ${OS_RELEASE_FILENAME} OS_RELEASE) - string(FIND "${OS_RELEASE}" "ID=alpine" CLR_CMAKE_PLATFORM_ALPINE_LINUX) - if(CLR_CMAKE_PLATFORM_ALPINE_LINUX EQUAL -1) - unset(CLR_CMAKE_PLATFORM_ALPINE_LINUX) - endif(CLR_CMAKE_PLATFORM_ALPINE_LINUX EQUAL -1) - endif(EXISTS ${OS_RELEASE_FILENAME}) + # Detect Linux ID + if(DEFINED CLR_CMAKE_LINUX_ID) + if(CLR_CMAKE_LINUX_ID STREQUAL alpine) + set(CLR_CMAKE_PLATFORM_ALPINE_LINUX) + endif() + endif(DEFINED CLR_CMAKE_LINUX_ID) endif(CMAKE_SYSTEM_NAME STREQUAL Linux) if(CMAKE_SYSTEM_NAME STREQUAL Darwin) |