diff options
| author | Petr Bred <bredpetr@gmail.com> | 2018-04-11 16:57:04 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2018-04-11 16:57:04 +0300 |
| commit | 213fa37d7a2308f39aeba38a786fc89b847f44e4 (patch) | |
| tree | a3023cab4268814ed4f2c7f9ef5d66d7142fed49 /src/Native | |
| parent | 7741fe1e70af4cf76fb67b2618a1a299101f7b37 (diff) | |
Fix cmake toolchain compile flags loop (#5646)
- fix https://github.com/dotnet/corert/issues/5093
- cmake toolchain refactoring
- synchronization with CoreCLR/CoreFX
Signed-off-by: Petr Bred <bredpetr@gmail.com>
Diffstat (limited to 'src/Native')
| -rwxr-xr-x | src/Native/gen-buildsys-clang.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Native/gen-buildsys-clang.sh b/src/Native/gen-buildsys-clang.sh index fed57d122..38c31c064 100755 --- a/src/Native/gen-buildsys-clang.sh +++ b/src/Native/gen-buildsys-clang.sh @@ -109,8 +109,12 @@ 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" + fi + export TARGET_BUILD_ARCH=$build_arch + 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 == "wasm" ]; then |