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 /src/pal/tools | |
| 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 'src/pal/tools')
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 6c264cbc84..924a365af9 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -139,6 +139,17 @@ if [[ -n "$CROSSCOMPILE" ]]; then fi cmake_extra_defines="$cmake_extra_defines -C $CONFIG_DIR/tryrun.cmake" cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$CONFIG_DIR/toolchain.cmake" + cmake_extra_defines="$cmake_extra_defines -DCLR_UNIX_CROSS_BUILD=1" +fi +if [ $OS == "Linux" ]; then + linux_id_file="/etc/os-release" + if [[ -n "$CROSSCOMPILE" ]]; then + linux_id_file="$ROOTFS_DIR/$linux_id_file" + fi + if [[ -e $linux_id_file ]]; then + source $linux_id_file + cmake_extra_defines="$cmake_extra_defines -DCLR_CMAKE_LINUX_ID=$ID" + fi fi if [ "$build_arch" == "armel" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" |