Skip to content

Commit 0369e6c

Browse files
committed
Auto merge of #59886 - mati865:musl_toolchain, r=alexcrichton
musl: do not compress debug section This should be beta nominated. Fixes #59411 (this time for real). Test with `DEPLOY=1 ./src/ci/docker/run.sh dist-x86_64-musl`, without `DEPLOY=1` libs are built without debuginfo. r? @alexcrichton
2 parents cd8b437 + 7276eb5 commit 0369e6c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/ci/docker/dist-x86_64-musl/Dockerfile

+5-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ WORKDIR /build/
2121

2222
COPY scripts/musl-toolchain.sh /build/
2323
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
24-
RUN CFLAGS="-Wa,-mrelax-relocations=no" \
25-
CXXFLAGS="-Wa,-mrelax-relocations=no" \
24+
RUN CFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \
25+
CXXFLAGS="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none -Wl,--compress-debug-sections=none" \
2626
bash musl-toolchain.sh x86_64 && rm -rf build
2727

2828
COPY scripts/sccache.sh /scripts/
@@ -38,7 +38,9 @@ ENV RUST_CONFIGURE_ARGS \
3838
# way to produce "super compatible" binaries.
3939
#
4040
# See: https://github.com/rust-lang/rust/issues/34978
41-
ENV CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no
41+
# And: https://github.com/rust-lang/rust/issues/59411
42+
ENV CFLAGS_x86_64_unknown_linux_musl="-Wa,-mrelax-relocations=no -Wa,--compress-debug-sections=none \
43+
-Wl,--compress-debug-sections=none"
4244

4345
ENV HOSTS=x86_64-unknown-linux-musl \
4446
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \

0 commit comments

Comments
 (0)