Rollup merge of rust-lang#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.
kennytm · Jul 24, 2018 · cf995d6 · cf995d6
2 parents 6a1c063 + 53ae366
commit cf995d6
Showing 1 changed file with 1 addition and 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
@@ -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