diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-01-30 17:57:16 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2016-01-30 17:57:16 +0530 |
| commit | 5ff52dbf2ffdde50a126c4ad1a2da2cebbba317a (patch) | |
| tree | f0771481e8eb13f28483bd87904b88a418658fcf | |
| parent | b83454a69f9da5348e0cc232ae2e30e3d3b6555c (diff) | |
| parent | ea31ff20f0437db5f77fc3e8d6d6f2efad74f887 (diff) | |
| download | rust-5ff52dbf2ffdde50a126c4ad1a2da2cebbba317a.tar.gz rust-5ff52dbf2ffdde50a126c4ad1a2da2cebbba317a.zip | |
Rollup merge of #31290 - alexcrichton:fix-powerpc64, r=brson
We forgot to pass down the `-m64` flag to gcc, so we were actually compiling powerpc code which would then later fail to link!
| -rw-r--r-- | mk/cfg/armv7-unknown-linux-gnueabihf.mk | 6 | ||||
| -rw-r--r-- | mk/cfg/powerpc64-unknown-linux-gnu.mk | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/cfg/armv7-unknown-linux-gnueabihf.mk b/mk/cfg/armv7-unknown-linux-gnueabihf.mk index c676bfb1289..546c71f667f 100644 --- a/mk/cfg/armv7-unknown-linux-gnueabihf.mk +++ b/mk/cfg/armv7-unknown-linux-gnueabihf.mk @@ -1,5 +1,5 @@ # armv7-unknown-linux-gnueabihf configuration -CROSS_PREFIX_armv7-unknown-linux-gnueabihf=armv7-unknown-linux-gnueabihf- +CROSS_PREFIX_armv7-unknown-linux-gnueabihf=arm-linux-gnueabihf- CC_armv7-unknown-linux-gnueabihf=gcc CXX_armv7-unknown-linux-gnueabihf=g++ CPP_armv7-unknown-linux-gnueabihf=gcc -E @@ -8,8 +8,8 @@ CFG_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).so CFG_STATIC_LIB_NAME_armv7-unknown-linux-gnueabihf=lib$(1).a CFG_LIB_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.so CFG_LIB_DSYM_GLOB_armv7-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM -CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) +CFG_JEMALLOC_CFLAGS_armv7-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS) -march=armv7 +CFG_GCCISH_CFLAGS_armv7-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS) -march=armv7 CFG_GCCISH_CXXFLAGS_armv7-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS) CFG_GCCISH_LINK_FLAGS_armv7-unknown-linux-gnueabihf := -shared -fPIC -g CFG_GCCISH_DEF_FLAG_armv7-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list= diff --git a/mk/cfg/powerpc64-unknown-linux-gnu.mk b/mk/cfg/powerpc64-unknown-linux-gnu.mk index cf49c711ba6..f6e6436f615 100644 --- a/mk/cfg/powerpc64-unknown-linux-gnu.mk +++ b/mk/cfg/powerpc64-unknown-linux-gnu.mk @@ -8,6 +8,7 @@ CFG_LIB_NAME_powerpc64-unknown-linux-gnu=lib$(1).so CFG_STATIC_LIB_NAME_powerpc64-unknown-linux-gnu=lib$(1).a CFG_LIB_GLOB_powerpc64-unknown-linux-gnu=lib$(1)-*.so CFG_LIB_DSYM_GLOB_powerpc64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM +CFG_JEMALLOC_CFLAGS_powerpc64-unknown-linux-gnu := -m64 CFG_CFLAGS_powerpc64-unknown-linux-gnu := -m64 $(CFLAGS) CFG_GCCISH_CFLAGS_powerpc64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64 $(CFLAGS) CFG_GCCISH_CXXFLAGS_powerpc64-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) |