From 016fd7d77d55a072e89d3dc1b87684db6e943d09 Mon Sep 17 00:00:00 2001 From: Anton Alkin Date: Wed, 25 Sep 2024 10:43:52 +0200 Subject: [PATCH] arrow fallback to llvm@18 or 17 --- arrow.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/arrow.sh b/arrow.sh index d1b1661750..a2b2940aaf 100644 --- a/arrow.sh +++ b/arrow.sh @@ -61,15 +61,16 @@ 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" - else - # fall back to llvm@17 - if [ -d "$(brew --prefix llvm)@17" ]; then - CLANG_EXECUTABLE="$(brew --prefix llvm)@17/bin/clang" - fi - fi + # use llvm@18 + if [ -d "$(brew --prefix llvm)@18" ]; then + CLANG_EXECUTABLE="$(brew --prefix llvm)@18/bin/clang" + fi + # fall back to llvm@17 + if [ -d "$(brew --prefix llvm)@17" ]; then + CLANG_EXECUTABLE="$(brew --prefix llvm)@17/bin/clang" + fi + echo "Need llvm@18 or llvm@17" + exit 1 ;; *) CLANG_EXECUTABLE="${CLANG_ROOT}/bin-safe/clang"