From cbb38ce37524a101d31277810a7c358678f9bc3a Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Thu, 22 Sep 2016 22:53:18 +0900 Subject: [PATCH] Supports cross build configuration override (#7307) --- src/pal/tools/gen-buildsys-clang.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index b7945f3..022a9cc 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" -- 2.7.4