diff --git a/arrow.sh b/arrow.sh index 4cc89602c9..cf8cd01fd7 100644 --- a/arrow.sh +++ b/arrow.sh @@ -62,18 +62,18 @@ rsync -a --exclude='**/.git' --delete --delete-excluded "$SOURCEDIR/" ./src_tmp/ case $ARCHITECTURE in osx*) # use default llvm from homebrew if available - if [ -d `brew --prefix llvm` ]; then - CLANG_EXECUTABLE=`brew --prefix llvm`/bin/clang + if [ -d "$(brew --prefix llvm)" ]; then + CLANG_EXECUTABLE="`brew --prefix llvm`/bin/clang" else # fall back to llvm@17 - if [ -d `brew --prefix llvm`@17 ]; then - CLANG_EXECUTABLE=`brew --prefix llvm`@17/bin/clang + if [ -d "$(brew --prefix llvm)@17" ]; then + CLANG_EXECUTABLE="`brew --prefix llvm`@17/bin/clang" fi fi ;; *) - CLANG_EXECUTABLE=${CLANG_ROOT}/bin-safe/clang + CLANG_EXECUTABLE="${CLANG_ROOT}/bin-safe/clang ${GCC_TOOLCHAIN_REVISION:+--gcc-install-dir=$GCC_TOOLCHAIN_ROOT}" # this patches version script to hide llvm symbols in gandiva library sed -i.deleteme '/^[[:space:]]*extern/ a \ \ \ \ \ \ llvm*; LLVM*;' "./src_tmp/cpp/src/gandiva/symbols.map" ;;