Skip to content

Commit 305aca8

Browse files
committed
travis: Compile a more compatible libc.a for musl
The mitigations for rust-lang#34978 involve passing `-Wa,-mrelax-relocations=no` to all C code we compile, and we just forgot to pass it when compiling musl itself. Closes rust-lang#39979
1 parent 3954c70 commit 305aca8

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/ci/docker/linux-tested-targets/build-musl.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111

1212
set -ex
1313

14-
export CFLAGS="-fPIC"
14+
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
15+
export CFLAGS="-fPIC -Wa,-mrelax-relocations=no"
16+
export CXXFLAGS="-Wa,-mrelax-relocations=no"
17+
1518
MUSL=musl-1.1.14
1619
curl https://www.musl-libc.org/releases/$MUSL.tar.gz | tar xzf -
1720
cd $MUSL

0 commit comments

Comments
 (0)