diff options
| author | petevine <petevine@users.noreply.github.com> | 2016-03-19 00:04:27 +0100 |
|---|---|---|
| committer | petevine <petevine@users.noreply.github.com> | 2016-03-19 00:04:27 +0100 |
| commit | 2ab1f0a850f4e02c5dacf882c040b3acee57f86a (patch) | |
| tree | 946fdf3d02719d75f6db8d4c566b71cee5a66cab | |
| parent | fc9e1d0f55f721461b73628f12cf64de31be55af (diff) | |
| download | rust-2ab1f0a850f4e02c5dacf882c040b3acee57f86a.tar.gz rust-2ab1f0a850f4e02c5dacf882c040b3acee57f86a.zip | |
Use explicit -march flags in the i586 mk file
`-march` should definitely go last, after the environment C(XX)FLAGS, or it's back to square one. This fixes cross-compilation issues on x86_64.
| -rw-r--r-- | mk/cfg/i586-unknown-linux-gnu.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/cfg/i586-unknown-linux-gnu.mk b/mk/cfg/i586-unknown-linux-gnu.mk index 0609f365de4..2b28550320d 100644 --- a/mk/cfg/i586-unknown-linux-gnu.mk +++ b/mk/cfg/i586-unknown-linux-gnu.mk @@ -7,9 +7,9 @@ CFG_LIB_NAME_i586-unknown-linux-gnu=lib$(1).so CFG_STATIC_LIB_NAME_i586-unknown-linux-gnu=lib$(1).a CFG_LIB_GLOB_i586-unknown-linux-gnu=lib$(1)-*.so CFG_LIB_DSYM_GLOB_i586-unknown-linux-gnu=lib$(1)-*.dylib.dSYM -CFG_JEMALLOC_CFLAGS_i586-unknown-linux-gnu := -m32 $(CFLAGS) -CFG_GCCISH_CFLAGS_i586-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) -CFG_GCCISH_CXXFLAGS_i586-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) +CFG_JEMALLOC_CFLAGS_i586-unknown-linux-gnu := -m32 $(CFLAGS) -march=pentium +CFG_GCCISH_CFLAGS_i586-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS) -march=pentium +CFG_GCCISH_CXXFLAGS_i586-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) -march=pentium CFG_GCCISH_LINK_FLAGS_i586-unknown-linux-gnu := -shared -fPIC -ldl -pthread -lrt -g -m32 CFG_GCCISH_DEF_FLAG_i586-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list= CFG_LLC_FLAGS_i586-unknown-linux-gnu := |