diff options
| author | bors <bors@rust-lang.org> | 2016-07-01 12:51:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 12:51:59 -0700 |
| commit | 5661be01b61bbd22afbd95fde88591bc50947b42 (patch) | |
| tree | 2204eef0ec6ef6653e8d2b39ae5fee9ca5e368a3 | |
| parent | 16281888c0f319706cd07e3c569e0aeb5a66d3b6 (diff) | |
| parent | ab06acedd650d25fcdecf1ee08bb4eb2837669bd (diff) | |
| download | rust-5661be01b61bbd22afbd95fde88591bc50947b42.tar.gz rust-5661be01b61bbd22afbd95fde88591bc50947b42.zip | |
Auto merge of #34578 - alexcrichton:lets-just-keep-trying-to-fix-the-nightlies, r=brson
mk: Request -march=i686 on i686 Linux Apparently the gcc on our dist bot is so old and/or obscure that the default `-m32` switch doesn't think it can generate i686 code (or something like that). The compiler-rt build system probes for the `__i686__` define in GCC to compile for an i686 (vs i386) target, so this was failing on the bots. This tweaks instead to pass `-march=i686` on i686-unknown-linux-gnu to C code to ensure that we're compiling for i686 instead of i386. This should hopefully not actually have an impact other than maybe doing some random optimization it wasn't able to do so before. In theory this isn't making the target less compatible as all Rust code is already compiled for i686. Hopefully closes #34572
| -rw-r--r-- | mk/cfg/i686-unknown-linux-gnu.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/cfg/i686-unknown-linux-gnu.mk b/mk/cfg/i686-unknown-linux-gnu.mk index 88c0907f63b..129af8ac696 100644 --- a/mk/cfg/i686-unknown-linux-gnu.mk +++ b/mk/cfg/i686-unknown-linux-gnu.mk @@ -8,7 +8,7 @@ CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM CFG_JEMALLOC_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS) -CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) +CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) -march=i686 CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32 CFG_GCCISH_DEF_FLAG_i686-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list= |