Skip to content

Commit 5661be0

Browse files
authored
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
2 parents 1628188 + ab06ace commit 5661be0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mk/cfg/i686-unknown-linux-gnu.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
88
CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
99
CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
1010
CFG_JEMALLOC_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS)
11-
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) -march=i686
1212
CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
1313
CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32
1414
CFG_GCCISH_DEF_FLAG_i686-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=

0 commit comments

Comments
 (0)