diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-10-16 12:42:36 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-10-16 14:30:56 -0700 |
| commit | 4fe5932e3aabe18a293ba071d08e49f5950a9c69 (patch) | |
| tree | 058dd1c1fdf6d42517449bf6209deb3259418426 | |
| parent | 2199d18e50b88702d48535678b5a6d7cfe75171f (diff) | |
| download | rust-4fe5932e3aabe18a293ba071d08e49f5950a9c69.tar.gz rust-4fe5932e3aabe18a293ba071d08e49f5950a9c69.zip | |
mk: Fix compile for mips
* Don't pass `-mno-compact-eh`, apparently not all compilers have this? * Don't pass `+o32`, apparently LLVm doesn't recognize this * Use `mipsel-linux-gnu` as a prefix instead of `mipsel-unknown-linux-gnu`, this matches the ubuntu package at least!
| -rw-r--r-- | mk/cfg/mips-unknown-linux-gnu.mk | 6 | ||||
| -rw-r--r-- | mk/cfg/mipsel-unknown-linux-gnu.mk | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/cfg/mips-unknown-linux-gnu.mk b/mk/cfg/mips-unknown-linux-gnu.mk index ba5f6d0e756..65b08774d49 100644 --- a/mk/cfg/mips-unknown-linux-gnu.mk +++ b/mk/cfg/mips-unknown-linux-gnu.mk @@ -7,8 +7,8 @@ CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM -CFG_JEMALLOC_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS) -CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS) +CFG_JEMALLOC_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 $(CFLAGS) +CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 $(CFLAGS) CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti $(CXXFLAGS) CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32 CFG_GCCISH_DEF_FLAG_mips-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list= @@ -20,5 +20,5 @@ CFG_UNIXY_mips-unknown-linux-gnu := 1 CFG_LDPATH_mips-unknown-linux-gnu := CFG_RUN_mips-unknown-linux-gnu= CFG_RUN_TARG_mips-unknown-linux-gnu= -RUSTC_FLAGS_mips-unknown-linux-gnu := -C target-cpu=mips32r2 -C target-feature="+mips32r2,+o32" -C soft-float +RUSTC_FLAGS_mips-unknown-linux-gnu := -C target-cpu=mips32r2 -C target-feature="+mips32r2" -C soft-float CFG_GNU_TRIPLE_mips-unknown-linux-gnu := mips-unknown-linux-gnu diff --git a/mk/cfg/mipsel-unknown-linux-gnu.mk b/mk/cfg/mipsel-unknown-linux-gnu.mk index 539038c7434..4dadfc275d3 100644 --- a/mk/cfg/mipsel-unknown-linux-gnu.mk +++ b/mk/cfg/mipsel-unknown-linux-gnu.mk @@ -1,8 +1,8 @@ # mipsel-unknown-linux-gnu configuration -CC_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-gcc -CXX_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-g++ -CPP_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-gcc -AR_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-ar +CC_mipsel-unknown-linux-gnu=mipsel-linux-gnu-gcc +CXX_mipsel-unknown-linux-gnu=mipsel-linux-gnu-g++ +CPP_mipsel-unknown-linux-gnu=mipsel-linux-gnu-gcc +AR_mipsel-unknown-linux-gnu=mipsel-linux-gnu-ar CFG_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).so CFG_STATIC_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).a CFG_LIB_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.so @@ -20,5 +20,5 @@ CFG_UNIXY_mipsel-unknown-linux-gnu := 1 CFG_LDPATH_mipsel-unknown-linux-gnu := CFG_RUN_mipsel-unknown-linux-gnu= CFG_RUN_TARG_mipsel-unknown-linux-gnu= -RUSTC_FLAGS_mipsel-unknown-linux-gnu := -C target-cpu=mips32 -C target-feature="+mips32,+o32" +RUSTC_FLAGS_mipsel-unknown-linux-gnu := -C target-cpu=mips32 -C target-feature="+mips32" CFG_GNU_TRIPLE_mipsel-unknown-linux-gnu := mipsel-unknown-linux-gnu |