Skip to content

Commit

Permalink
fixup! arrow: use clang from llvm installation to avoid stack probing…
Browse files Browse the repository at this point in the history
… issue with llvm@18
  • Loading branch information
aalkin committed Aug 15, 2024
1 parent 895054f commit 0e99a56
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arrow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down

0 comments on commit 0e99a56

Please sign in to comment.