Skip to content

Commit cf995d6

Browse files
authored
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.
2 parents 6a1c063 + 53ae366 commit cf995d6

File tree

1 file changed

+1
-3
lines changed
  • src/ci/docker/dist-i586-gnu-i586-i686-musl

1 file changed

+1
-3
lines changed

src/ci/docker/dist-i586-gnu-i586-i686-musl/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ ENV RUST_CONFIGURE_ARGS \
4242
# See: https://github.com/rust-lang/rust/issues/34978
4343
ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no
4444
ENV CFLAGS_i586_unknown_linux_gnu=-Wa,-mrelax-relocations=no
45-
# FIXME remove -Wl,-melf_i386 after cc is updated to include
46-
# https://github.com/alexcrichton/cc-rs/pull/281
47-
ENV CFLAGS_i586_unknown_linux_musl="-Wa,-mrelax-relocations=no -Wl,-melf_i386"
45+
ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no
4846

4947
ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl
5048

0 commit comments

Comments
 (0)