diff options
| author | bors <bors@rust-lang.org> | 2017-11-17 05:18:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-17 05:18:45 +0000 |
| commit | 3bcb00dbc2edcdc498a9e60a68a14652162d1921 (patch) | |
| tree | 5c7e52ab03ad5ea7615c028fb23e1a574b032838 | |
| parent | 8fbb46c4a1751c1a5f50e65fa2601f05819ee1c4 (diff) | |
| parent | 5146663602933c66293ecdc19b9c4bb1a33c2c7e (diff) | |
| download | rust-3bcb00dbc2edcdc498a9e60a68a14652162d1921.tar.gz rust-3bcb00dbc2edcdc498a9e60a68a14652162d1921.zip | |
Auto merge of #45991 - gnzlbg:fix_i586, r=alexcrichton
fix linking error on i586 Try to fix this linking error on i586 in cross: https://travis-ci.org/japaric/cross/builds/302095949#L8670 The problem is that `std` is built in Ubuntu 16.04 and `cross` uses a linker from 12.04. Currently this fix solves the problem for `i686-musl` making it "supercompatible", this PR applies the fix to `i586` as well. The cross PR is here: https://github.com/japaric/cross/pull/157
| -rw-r--r-- | src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile b/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile index efde3ff5296..2fb12196811 100644 --- a/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile +++ b/src/ci/docker/dist-i586-gnu-i686-musl/Dockerfile @@ -34,6 +34,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 ENV SCRIPT \ python2.7 ../x.py test \ |