OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #40130 - alexcrichton:fix-musl-again, r=nikomatsakis

Browse Source 
travis: Fix typos in linux-tested-targets

These flags were supposed to be relevant for musl, not for gnu

cc #39979
This commit is contained in:
Steve Klabnik 2017-02-28 15:38:39 -08:00 committed by GitHub
commit aff269b5dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ci/docker/linux-tested-targets/Dockerfile
View File

@ -39,8 +39,8 @@ ENV RUST_CONFIGURE_ARGS \
# way to produce "super compatible" binaries. # way to produce "super compatible" binaries.
# #
# See: https://github.com/rust-lang/rust/issues/34978 # See: https://github.com/rust-lang/rust/issues/34978
ENV CFLAGS_i686_unknown_linux_gnu=-Wa,-mrelax-relocations=no \ ENV CFLAGS_i686_unknown_linux_musl=-Wa,-mrelax-relocations=no \
CFLAGS_x86_64_unknown_linux_gnu=-Wa,-mrelax-relocations=no CFLAGS_x86_64_unknown_linux_musl=-Wa,-mrelax-relocations=no
ENV SCRIPT \ ENV SCRIPT \
python2.7 ../x.py test \ python2.7 ../x.py test \