Skip to content

Commit 8ebcab7

Browse files
committed
More work on mingw cross build.
1 parent 4e89b5a commit 8ebcab7

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ ifdef CFG_UNIXY
111111
CFG_LDPATH :=$(CFG_LDPATH):$$PATH
112112
CFG_RUN_TARG=PATH=$(CFG_BUILD_DIR)/$(1)/lib:$(CFG_LDPATH) $(2)
113113
CFG_RUN_TEST=PATH=$(CFG_LDPATH):$(call CFG_TESTLIB,$(1)) $(1)
114-
114+
CFG_WINDOWSY := 1
115115
CFG_INFO := $(info cfg: mingw-cross)
116116
CFG_GCCISH_CROSS := i586-mingw32msvc-
117117
ifdef CFG_VALGRIND
118118
CFG_VALGRIND += wine
119119
endif
120120

121-
CFG_GCCISH_CFLAGS := -march=i686 -O2
121+
CFG_GCCISH_CFLAGS := -fno-strict-aliasing -march=i686 -O2
122122
CFG_GCCISH_PRE_LIB_FLAGS :=
123123
CFG_GCCISH_POST_LIB_FLAGS :=
124124
CFG_GCCISH_DEF_FLAG :=

mk/rustllvm.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
2222
rustllvm/rustllvmbits.a: $(RUSTLLVM_LIB_OBJS)
2323
@$(call E, archive: $@)
2424
$(Q)rm -f $@
25-
$(Q)ar crs $@ $^
25+
$(Q)$(CFG_GCCISH_CROSS)ar crs $@ $^
26+
$(Q)$(CFG_GCCISH_CROSS)ranlib $@
2627

2728
# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
2829
# it has no -whole-archive.

0 commit comments

Comments
 (0)