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 a8689ee commit ea03efa
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions arrow.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: arrow
version: "v17.0.0-alice1"
tag: apache-arrow-17.0.0-alice1
version: "v17.0.0-alice4"
tag: apache-arrow-17.0.0-alice4
source: https://github.com/alisw/arrow.git
requires:
- boost
Expand Down Expand Up @@ -73,7 +73,7 @@ case $ARCHITECTURE in
fi
;;
*)
CLANG_EXECUTABLE="${CLANG_ROOT}/bin-safe/clang ${GCC_TOOLCHAIN_REVISION:+--gcc-install-dir=$GCC_TOOLCHAIN_ROOT}"
CLANG_EXECUTABLE="${CLANG_ROOT}/bin-safe/clang"
# 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 Expand Up @@ -123,7 +123,8 @@ cmake ./src_tmp/cpp
-DARROW_FILESYSTEM=ON \
-DARROW_BUILD_STATIC=OFF \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DCLANG_EXECUTABLE="$CLANG_EXECUTABLE"
-DCLANG_EXECUTABLE="$CLANG_EXECUTABLE" \
${GCC_TOOLCHAIN_REVISION:+-DGCC_TOOLCHAIN_ROOT=$GCC_TOOLCHAIN_ROOT}

make ${JOBS:+-j $JOBS}
make install
Expand Down

0 comments on commit ea03efa

Please sign in to comment.