Skip to content

Commit 95de4e1

Browse files
committed
Disable zlib
1 parent fb5d8e5 commit 95de4e1

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

cpp/cmake_modules/ThirdpartyToolchain.cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2073,7 +2073,10 @@ function(build_protobuf)
20732073
"-DCMAKE_C_FLAGS="
20742074
"-DCMAKE_INSTALL_PREFIX=${PROTOBUF_HOST_PREFIX}"
20752075
-Dprotobuf_BUILD_TESTS=OFF
2076-
-Dprotobuf_DEBUG_POSTFIX=)
2076+
-Dprotobuf_DEBUG_POSTFIX=
2077+
# OFF so protobuf does not take conda's zlib and add its include dir
2078+
# globally, so vendored Abseil sources compile against env's old headers
2079+
-Dprotobuf_WITH_ZLIB=OFF)
20772080
if(ABSL_VENDORED)
20782081
# Force protobuf to reuse Arrow's already-extracted absl source
20792082
# so we don't re-download and we don't have issues with multiple abseil.

0 commit comments

Comments
 (0)