diff options
| author | Jonghyun Park <parjong@gmail.com> | 2016-09-22 22:53:18 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2016-09-22 15:53:18 +0200 |
| commit | cbb38ce37524a101d31277810a7c358678f9bc3a (patch) | |
| tree | 840ddab29b4d43223ab75460d05245610459e27d /src/pal/tools/gen-buildsys-clang.sh | |
| parent | 621c0aba11a96772686089433fb20c8438e59100 (diff) | |
| download | coreclr-cbb38ce37524a101d31277810a7c358678f9bc3a.tar.gz coreclr-cbb38ce37524a101d31277810a7c358678f9bc3a.tar.bz2 coreclr-cbb38ce37524a101d31277810a7c358678f9bc3a.zip | |
Supports cross build configuration override (#7307)
Diffstat (limited to 'src/pal/tools/gen-buildsys-clang.sh')
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index b7945f3091..022a9ccf56 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -131,8 +131,11 @@ if [[ -n "$CROSSCOMPILE" ]]; then echo "ROOTFS_DIR not set for crosscompile" exit 1 fi - cmake_extra_defines="$cmake_extra_defines -C $1/cross/$build_arch/tryrun.cmake" - cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$1/cross/$build_arch/toolchain.cmake" + if [[ -z $CONFIG_DIR ]]; then + CONFIG_DIR="$1/cross/$build_arch" + 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" fi if [ "$build_arch" == "arm-softfp" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" |