Skip to content

Commit f92fd8e

Browse files
committed
build: Keep non-bazel builds on zlib for now
Fails locally with: rust-lld: error: --compress-debug-sections: LLVM was not built with LLVM_ENABLE_ZSTD or did not find zstd at build time Follow-up to MaterializeInc#30496
1 parent b5bf377 commit f92fd8e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: .cargo/config.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# Sync: This target-cpu and list of features should be kept in sync with the ones in ci-builder and
1414
# xcompile.
1515
rustflags = [
16-
"-Clink-arg=-Wl,--compress-debug-sections=zstd",
16+
"-Clink-arg=-Wl,--compress-debug-sections=zlib",
1717
"-Clink-arg=-Wl,-O3",
1818
"-Clink-arg=-fuse-ld=lld",
1919
"-Csymbol-mangling-version=v0",
@@ -30,7 +30,7 @@ rustflags = [
3030
# xcompile.
3131
[target."aarch64-unknown-linux-gnu"]
3232
rustflags = [
33-
"-Clink-arg=-Wl,--compress-debug-sections=zstd",
33+
"-Clink-arg=-Wl,--compress-debug-sections=zlib",
3434
"-Clink-arg=-Wl,-O3",
3535
"-Clink-arg=-fuse-ld=lld",
3636
"-Csymbol-mangling-version=v0",

Diff for: ci/builder/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ ENV CC=$ARCH_GCC-unknown-linux-gnu-cc
303303
ENV CXX=$ARCH_GCC-unknown-linux-gnu-c++
304304
ENV CXXSTDLIB=static=stdc++
305305
ENV LDFLAGS="-fuse-ld=lld -static-libstdc++"
306-
ENV RUSTFLAGS="-Clink-arg=-Wl,--compress-debug-sections=zstd -Clink-arg=-Wl,-O3 -Clink-arg=-fuse-ld=lld -L/opt/x-tools/$ARCH_GCC-unknown-linux-gnu/$ARCH_GCC-unknown-linux-gnu/sysroot/lib/ -Csymbol-mangling-version=v0 --cfg=tokio_unstable"
306+
ENV RUSTFLAGS="-Clink-arg=-Wl,--compress-debug-sections=zlib -Clink-arg=-Wl,-O3 -Clink-arg=-fuse-ld=lld -L/opt/x-tools/$ARCH_GCC-unknown-linux-gnu/$ARCH_GCC-unknown-linux-gnu/sysroot/lib/ -Csymbol-mangling-version=v0 --cfg=tokio_unstable"
307307
ENV TARGET_AR=$AR
308308
ENV TARGET_CC=$CC
309309
ENV TARGET_CXX=$CXX

Diff for: misc/python/materialize/xcompile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ def cargo(
150150
}
151151

152152
rustflags += [
153-
"-Clink-arg=-Wl,--compress-debug-sections=zstd",
153+
"-Clink-arg=-Wl,--compress-debug-sections=zlib",
154154
"-Clink-arg=-Wl,-O3",
155155
"-Csymbol-mangling-version=v0",
156156
"--cfg=tokio_unstable",

0 commit comments

Comments
 (0)