diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2017-02-28 15:38:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 15:38:39 -0800 |
| commit | aff269b5dc373ff5d4fd6e8a1d3230a597f300fa (patch) | |
| tree | 18a3f8dcc284f1d02f776012ca5b6cad1a2a4051 /src/ci | |
| parent | be760566cf938d11d34c2f6bd90d8fd0f67c2344 (diff) | |
| parent | ac0521e52643bf01b6d15d8c7f7cc5974de5e196 (diff) | |
| download | rust-aff269b5dc373ff5d4fd6e8a1d3230a597f300fa.tar.gz rust-aff269b5dc373ff5d4fd6e8a1d3230a597f300fa.zip | |
Rollup merge of #40130 - alexcrichton:fix-musl-again, r=nikomatsakis
travis: Fix typos in linux-tested-targets These flags were supposed to be relevant for musl, not for gnu cc #39979
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/linux-tested-targets/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/docker/linux-tested-targets/Dockerfile b/src/ci/docker/linux-tested-targets/Dockerfile index 06c14a96101..a7060cd55fe 100644 --- a/src/ci/docker/linux-tested-targets/Dockerfile +++ b/src/ci/docker/linux-tested-targets/Dockerfile @@ -39,8 +39,8 @@ ENV RUST_CONFIGURE_ARGS \ # way to produce "super compatible" binaries. # # See: https://github.com/rust-lang/rust/issues/34978 -ENV CFLAGS_i686_unknown_linux_gnu=-Wa,-mrelax-relocations=no \ - CFLAGS_x86_64_unknown_linux_gnu=-Wa,-mrelax-relocations=no +ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no \ + CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no ENV SCRIPT \ python2.7 ../x.py test \ |