diff options
| author | Mateusz Mikuła <matti@marinelayer.io> | 2019-03-04 14:00:05 +0100 |
|---|---|---|
| committer | Mateusz Mikuła <mati865@gmail.com> | 2019-03-13 22:21:06 +0100 |
| commit | 4dd57efae294a13a132b97325e7e89bc763e85e0 (patch) | |
| tree | f7b2baa7c16590f17767f671f642bd4480a40b33 | |
| parent | cbc1ce0b840830a7a390716bc8be435457892436 (diff) | |
| download | rust-4dd57efae294a13a132b97325e7e89bc763e85e0.tar.gz rust-4dd57efae294a13a132b97325e7e89bc763e85e0.zip | |
Disable relax relocations again
| -rw-r--r-- | src/ci/docker/dist-x86_64-musl/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ci/docker/dist-x86_64-musl/Dockerfile b/src/ci/docker/dist-x86_64-musl/Dockerfile index 2f538a28b43..3a95bfd6ef4 100644 --- a/src/ci/docker/dist-x86_64-musl/Dockerfile +++ b/src/ci/docker/dist-x86_64-musl/Dockerfile @@ -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 \ |