bazel: add zlib back to clang builds

redpanda-data · Feb 20, 2025 · 082c967 · 082c967
1 parent 6687a50
commit 082c967
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/bazel/toolchain/Dockerfile.llvm b/bazel/toolchain/Dockerfile.llvm
@@ -14,7 +14,7 @@ ADD --chmod=755 https://github.com/kadwanev/retry/raw/20997c7712a4/retry /usr/bi
 
 WORKDIR /opt
 
-ARG LLVM_VERSION=19.1.6
+ARG LLVM_VERSION=19.1.7
 
 RUN git clone --branch llvmorg-${LLVM_VERSION} --single-branch https://github.com/llvm/llvm-project.git
 
@@ -43,8 +43,9 @@ cmake -G Ninja -DLLVM_TARGETS_TO_BUILD='AArch64;X86' \\
   -DLLVM_INCLUDE_EXAMPLES=OFF \\
   -DLLVM_INCLUDE_UTILS=OFF \\
   -DLLVM_INCLUDE_DOCS=OFF \\
-  -DLLVM_ENABLE_ZLIB=OFF \\
-  -DLLVM_ENABLE_ZSTD=OFF \\
+  -DLLVM_ENABLE_ZLIB=ON \\
+  -DLLVM_ENABLE_ZSTD=ON \\
+  -DLLVM_USE_STATIC_ZSTD=TRUE \\
   -DLLVM_ENABLE_Z3_SOLVER=OFF \\
   -DLLVM_ENABLE_DIA_SDK=OFF \\
   -DLLVM_ENABLE_LIBEDIT=OFF \\
@@ -74,9 +75,7 @@ cmake -G Ninja -DLLVM_TARGETS_TO_BUILD='AArch64;X86' \\
   -DLIBCXXABI_USE_LLVM_UNWINDER=OFF \\
   -DLLVM_PARALLEL_COMPILE_JOBS=${MAX_COMPILER_JOBS} \\
   -DLLVM_PARALLEL_LINK_JOBS=${MAX_LINKER_JOBS} \\
-  -DLIBCXX_ABI_VERSION=2 \\
   -DLLVM_ENABLE_LIBCXX=ON \\
-  -DLLVM_STATIC_LINK_CXX_STDLIB=ON \\
   -DLLVM_ENABLE_LTO=On \\
   "\$@"