File tree Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Expand file tree Collapse file tree 2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -111,14 +111,14 @@ ifdef CFG_UNIXY
111
111
CFG_LDPATH :=$(CFG_LDPATH ) :$$PATH
112
112
CFG_RUN_TARG=PATH =$(CFG_BUILD_DIR ) /$(1 ) /lib:$(CFG_LDPATH ) $(2 )
113
113
CFG_RUN_TEST=PATH =$(CFG_LDPATH ) :$(call CFG_TESTLIB,$(1 ) ) $(1 )
114
-
114
+ CFG_WINDOWSY := 1
115
115
CFG_INFO := $(info cfg: mingw-cross)
116
116
CFG_GCCISH_CROSS := i586-mingw32msvc-
117
117
ifdef CFG_VALGRIND
118
118
CFG_VALGRIND += wine
119
119
endif
120
120
121
- CFG_GCCISH_CFLAGS := -march=i686 -O2
121
+ CFG_GCCISH_CFLAGS := -fno-strict-aliasing - march=i686 -O2
122
122
CFG_GCCISH_PRE_LIB_FLAGS :=
123
123
CFG_GCCISH_POST_LIB_FLAGS :=
124
124
CFG_GCCISH_DEF_FLAG :=
Original file line number Diff line number Diff line change @@ -22,7 +22,8 @@ RUSTLLVM_OBJS_OBJS := $(RUSTLLVM_OBJS_CS:.cpp=.o)
22
22
rustllvm/rustllvmbits.a : $(RUSTLLVM_LIB_OBJS )
23
23
@$(call E, archive: $@ )
24
24
$(Q ) rm -f $@
25
- $(Q ) ar crs $@ $^
25
+ $(Q )$(CFG_GCCISH_CROSS ) ar crs $@ $^
26
+ $(Q )$(CFG_GCCISH_CROSS ) ranlib $@
26
27
27
28
# Note: We pass $(CFG_LLVM_LIBS) twice to fix the windows link since
28
29
# it has no -whole-archive.
You can’t perform that action at this time.
0 commit comments