Skip to content

Commit 09ab800

Browse files
committed
Update macos path
1 parent feec071 commit 09ab800

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

ci/scripts/jni_macos_build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,19 @@ esac
9494

9595
# Set LLVM_DIR to point to vcpkg-installed LLVM if VCPKG_ROOT_LOCAL is set
9696
llvm_dir_arg=""
97+
gandiva_cxx_flags=""
9798
if [ -n "${VCPKG_ROOT_LOCAL:-}" ]; then
9899
llvm_cmake_dir="${VCPKG_ROOT_LOCAL}/installed/${vcpkg_triplet}/share/llvm"
99100
if [ -d "${llvm_cmake_dir}" ]; then
100101
llvm_dir_arg="-DLLVM_DIR=${llvm_cmake_dir}"
102+
103+
# vcpkg's clang needs to know where to find system C++ headers
104+
# Point it to the Xcode toolchain's C++ headers
105+
xcode_path="$(xcode-select -p)"
106+
cxx_include_path="${xcode_path}/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1"
107+
if [ -d "${cxx_include_path}" ]; then
108+
gandiva_cxx_flags="-DARROW_GANDIVA_PC_CXX_FLAGS=-isystem ${cxx_include_path}"
109+
fi
101110
fi
102111
fi
103112

@@ -124,6 +133,7 @@ cmake \
124133
-DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
125134
-DGTest_SOURCE=BUNDLED \
126135
${llvm_dir_arg} \
136+
${gandiva_cxx_flags} \
127137
-DPARQUET_BUILD_EXAMPLES=OFF \
128138
-DPARQUET_BUILD_EXECUTABLES=OFF \
129139
-DPARQUET_REQUIRE_ENCRYPTION=OFF \

0 commit comments

Comments
 (0)