Auto merge of #45991 - gnzlbg:fix_i586, r=alexcrichton

bors · bors · commit 3bcb00dbc2ed · 2017-11-17T05:18:45.000Z
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: cross-rs/cross#157
diff --git 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 \

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ ENV RUST_CONFIGURE_ARGS \`
`34`	`34`	`#`
`35`	`35`	`# See: https://github.com/rust-lang/rust/issues/34978`
`36`	`36`	`ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no`
	`37`	`+ENV CFLAGS_i586_unknown_linux_gnu=-Wa,-mrelax-relocations=no`
`37`	`38`
`38`	`39`	`ENV SCRIPT \`
`39`	`40`	`python2.7 ../x.py test \`