diff options
Diffstat (limited to 'src/pal/tools/gen-buildsys-clang.sh')
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 4054266f0b..db342eb2c9 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -18,18 +18,18 @@ then fi # Set up the environment to be used for building with clang. -if which "clang-$2.$3" > /dev/null 2>&1 +if command -v "clang-$2.$3" > /dev/null then - export CC="$(which clang-$2.$3)" - export CXX="$(which clang++-$2.$3)" -elif which "clang$2$3" > /dev/null 2>&1 + export CC="$(command -v clang-$2.$3)" + export CXX="$(command -v clang++-$2.$3)" +elif command -v "clang$2$3" > /dev/null then - export CC="$(which clang$2$3)" - export CXX="$(which clang++$2$3)" -elif which clang > /dev/null 2>&1 + export CC="$(command -v clang$2$3)" + export CXX="$(command -v clang++$2$3)" +elif command -v clang > /dev/null then - export CC="$(which clang)" - export CXX="$(which clang++)" + export CC="$(command -v clang)" + export CXX="$(command -v clang++)" else echo "Unable to find Clang Compiler" exit 1 @@ -97,12 +97,12 @@ else desired_llvm_version="-$desired_llvm_major_version.$desired_llvm_minor_version" fi locate_llvm_exec() { - if which "$llvm_prefix$1$desired_llvm_version" > /dev/null 2>&1 + if command -v "$llvm_prefix$1$desired_llvm_version" > /dev/null 2>&1 then - echo "$(which $llvm_prefix$1$desired_llvm_version)" - elif which "$llvm_prefix$1" > /dev/null 2>&1 + echo "$(command -v $llvm_prefix$1$desired_llvm_version)" + elif command -v "$llvm_prefix$1" > /dev/null 2>&1 then - echo "$(which $llvm_prefix$1)" + echo "$(command -v $llvm_prefix$1)" else exit 1 fi @@ -128,26 +128,31 @@ if [[ -n "$LLDB_INCLUDE_DIR" ]]; then fi if [[ -n "$CROSSCOMPONENT" ]]; then cmake_extra_defines="$cmake_extra_defines -DCLR_CROSS_COMPONENTS_BUILD=1" -else - if [[ -n "$CROSSCOMPILE" ]]; then - if ! [[ -n "$ROOTFS_DIR" ]]; then - echo "ROOTFS_DIR not set for crosscompile" - exit 1 - fi - 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 [[ -n "$CROSSCOMPILE" ]]; then + if ! [[ -n "$ROOTFS_DIR" ]]; then + echo "ROOTFS_DIR not set for crosscompile" + exit 1 + fi + 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 +if [ "$build_arch" == "armel" ]; then cmake_extra_defines="$cmake_extra_defines -DARM_SOFTFP=1" fi +if [ "$build_arch" == "arm" -o "$build_arch" == "armel" ]; then + overridefile=clang-compiler-override-arm.txt +else + overridefile=clang-compiler-override.txt +fi + cmake \ -G "$generator" \ - "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/clang-compiler-override.txt" \ + "-DCMAKE_USER_MAKE_RULES_OVERRIDE=$1/src/pal/tools/$overridefile" \ "-DCMAKE_AR=$llvm_ar" \ "-DCMAKE_LINKER=$llvm_link" \ "-DCMAKE_NM=$llvm_nm" \ |