diff options
| author | kennytm <kennytm@gmail.com> | 2018-07-24 09:49:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 09:49:49 +0800 |
| commit | cf995d654e215fa06b65f22688aecdff09d5d245 (patch) | |
| tree | 6c9b2c1244f7dab004a3fbeb07932d2bd279af0b /src/ci | |
| parent | 6a1c0637ce44aeea6c60527f4c0e7fb33f2bcd0d (diff) | |
| parent | 53ae36687374fd596702bb51e61795cabd1ec8ae (diff) | |
| download | rust-cf995d654e215fa06b65f22688aecdff09d5d245.tar.gz rust-cf995d654e215fa06b65f22688aecdff09d5d245.zip | |
Rollup merge of #52538 - ljedrz:old_musl_i586_flags, r=kennytm
Remove obsolete flags in the i586_musl Dockerfile Resolves an [outdated FIXME](https://github.com/rust-lang/rust/blob/ab8b961677ac5c74762dcea955aa0ff4d7fe4915/src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile#L45) in the Dockerfile for dist-i586-gnu-i586-i686-musl.
Diffstat (limited to 'src/ci')
| -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 |