user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable relax relocations again

Browse source
This commit is contained in:
Mateusz Mikuła 2019-03-04 14:00:05 +01:00 • committed by Mateusz Mikuła
parent cbc1ce0b84
commit 4dd57efae2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ci/docker/dist-x86_64-musl/Dockerfile
View file

@ -22,8 +22,9 @@ WORKDIR /build/
COPY scripts/musl-toolchain.sh /build/
# We need to mitigate rust-lang/rust#34978 when compiling musl itself as well
# TODO: Check what this issue is and if we can ignore it
RUN bash musl-toolchain.sh x86_64-linux-musl && rm -rf build
RUN CFLAGS="-Wa,-mrelax-relocations=no" \
CXXFLAGS="-Wa,-mrelax-relocations=no" \
bash musl-toolchain.sh x86_64-linux-musl && rm -rf build
COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh
@ -38,7 +39,7 @@ ENV RUST_CONFIGURE_ARGS \
# way to produce "super compatible" binaries.
#
# See: https://github.com/rust-lang/rust/issues/34978
#ENV CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no
ENV CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no
ENV HOSTS=x86_64-unknown-linux-musl \
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \