diff options
| author | ljedrz <ljedrz@gmail.com> | 2018-07-19 16:36:45 +0200 |
|---|---|---|
| committer | ljedrz <ljedrz@gmail.com> | 2018-07-19 16:36:45 +0200 |
| commit | 53ae36687374fd596702bb51e61795cabd1ec8ae (patch) | |
| tree | 5a0733a644bd33ad4b9d816d0f2cbef94a8ccca3 | |
| parent | 0fc4501256b002aef627880a9f6d18065b0ca931 (diff) | |
| download | rust-53ae36687374fd596702bb51e61795cabd1ec8ae.tar.gz | |
Remove obsolete flags in the i586_musl Dockerfile
| -rw-r--r-- | src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile index e12bed3abc5..ba2d32a9296 100644 --- a/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile +++ b/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile @@ -42,9 +42,7 @@ ENV RUST_CONFIGURE_ARGS \ # See: https://github.com/rust-lang/rust/issues/34978 ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no ENV CFLAGS_i586_unknown_linux_gnu=-Wa,-mrelax-relocations=no -# FIXME remove -Wl,-melf_i386 after cc is updated to include -# https://github.com/alexcrichton/cc-rs/pull/281 -ENV CFLAGS_i586_unknown_linux_musl="-Wa,-mrelax-relocations=no -Wl,-melf_i386" +ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl |