nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

More work on mingw cross build.

Browse Source
This commit is contained in:
Graydon Hoare 2011-06-27 12:43:45 -07:00
parent 4e89b5afe7
commit 8ebcab711d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/platform.mk
View File

@ -111,14 +111,14 @@ ifdef CFG_UNIXY
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
CFG_RUN_TEST=PATH=$(CFG_LDPATH):$(call CFG_TESTLIB,$(1)) $(1)
CFG_WINDOWSY := 1
CFG_INFO := $(info cfg: mingw-cross)
CFG_GCCISH_CROSS := i586-mingw32msvc-
ifdef CFG_VALGRIND
CFG_VALGRIND += wine
endif
CFG_GCCISH_CFLAGS := -march=i686 -O2
CFG_GCCISH_CFLAGS := -fno-strict-aliasing -march=i686 -O2
CFG_GCCISH_PRE_LIB_FLAGS :=
CFG_GCCISH_POST_LIB_FLAGS :=
CFG_GCCISH_DEF_FLAG :=

3
mk/rustllvm.mk
View File

@ -22,7 +22,8 @@ RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
@$(call E, archive: $@)
$(Q)rm -f $@
$(Q)ar crs $@ $^
$(Q)$(CFG_GCCISH_CROSS)ar crs $@ $^
$(Q)$(CFG_GCCISH_CROSS)ranlib $@
# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
# it has no -whole-archive.