Skip to content

Commit 6b86626

Browse files
committed
[Enhancement] Mirror Arrow 24 thirdparty fixes to the Darwin builder
The Linux build-thirdparty.sh Arrow 24 adaptations were not applied to the macOS builder, but vars.sh (Arrow 24) and be/CMakeLists.txt (which now links arrow_testing for all platforms) are shared. Without this, macOS installs no libarrow_testing.a and BE/test fails to link with -larrow_testing not found; the Arrow build itself would also fail earlier on thrift/C++20. Mirror the fixes in build-thirdparty-darwin.sh: - arrow: -DARROW_TESTING=ON (system GTest) so libarrow_testing.a is installed. - arrow: -DARROW_THRIFT_USE_SHARED=OFF and correctly-cased -DThrift_SOURCE=SYSTEM. - arrow: -fno-sized-deallocation (Arrow 24 forces C++20). - benchgen: bump CMAKE_CXX_STANDARD 17 -> 20 and add -fno-sized-deallocation.
1 parent 9f8aea5 commit 6b86626

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

thirdparty/build-thirdparty-darwin.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2019,6 +2019,10 @@ build_arrow() {
20192019
-DARROW_BUILD_STATIC=ON \
20202020
-DARROW_BUILD_SHARED=OFF \
20212021
-DARROW_BUILD_TESTS=OFF \
2022+
-DARROW_TESTING=ON \
2023+
-DGTest_SOURCE=SYSTEM \
2024+
-DGTest_ROOT="${TP_INSTALL_DIR}" \
2025+
-DCMAKE_CXX_FLAGS="-fno-sized-deallocation" \
20222026
-DARROW_BUILD_EXAMPLES=OFF \
20232027
-DARROW_BUILD_INTEGRATION=OFF \
20242028
-DARROW_BUILD_UTILITIES=OFF \
@@ -2082,7 +2086,8 @@ build_arrow() {
20822086
-Dflatbuffers_ROOT="${flatbuffers_prefix}" \
20832087
-DCMAKE_PREFIX_PATH="${arrow_prefix_path}" \
20842088
-DThrift_ROOT="${TP_INSTALL_DIR}" \
2085-
-Dthrift_SOURCE=SYSTEM \
2089+
-DARROW_THRIFT_USE_SHARED=OFF \
2090+
-DThrift_SOURCE=SYSTEM \
20862091
-Dxsimd_SOURCE=SYSTEM \
20872092
-Dxsimd_DIR="${TP_INSTALL_DIR}/share/cmake/xsimd" \
20882093
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
@@ -2908,10 +2913,12 @@ build_benchgen() {
29082913
cd "${TP_SOURCE_DIR}/${BENCHGEN_SOURCE}"
29092914
perl -0pi -e 's/brotlicommon snappy zstd\)/brotlicommon lz4 snappy zstd)/' \
29102915
cmake_modules/BenchmarkArrow.cmake
2916+
perl -0pi -e 's/set\(CMAKE_CXX_STANDARD 17\)/set(CMAKE_CXX_STANDARD 20)/' CMakeLists.txt
29112917
"${CMAKE_CMD}" -G "${CMAKE_GENERATOR}" \
29122918
-DCMAKE_BUILD_TYPE=Release \
29132919
-DCMAKE_INSTALL_LIBDIR=lib \
29142920
-DCMAKE_INSTALL_PREFIX="${TP_INSTALL_DIR}" \
2921+
-DCMAKE_CXX_FLAGS="-fno-sized-deallocation" \
29152922
-DBENCHGEN_ARROW_PREFIX="${TP_INSTALL_DIR}" \
29162923
-S . -B build
29172924
"${CMAKE_CMD}" --build build -j "${PARALLEL}"

0 commit comments

Comments
 (0)