Skip to content

Commit 3a34e93

Browse files
committed
auto merge of #6295 : yichoi/rust/pull-mingw32, r=brson
fix for #6279 #6253 mk: rt.mk regression patch for mingw32 after #6176 currently do not pass optimization option just make it works only mk: target.mk host.mk fix for duplicated rules of mingw32 after #6235 It can be simply fixed with CFG_LIB check whether bin or lib however considering multiple target triples with linux and windows, CFG_LIB needs to configurable #5223 and #5577
2 parents 45ae340 + 930908a commit 3a34e93

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

mk/host.mk

+2
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,10 @@ $$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
130130
$$(HBIN$(2)_H_$(4))/:
131131
mkdir -p $$@
132132

133+
ifneq ($(CFG_LIBDIR),bin)
133134
$$(HLIB$(2)_H_$(4))/:
134135
mkdir -p $$@
136+
endif
135137

136138
endef
137139

mk/rt.mk

-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ endif
163163
ifdef CFG_WINDOWSY_$(1)
164164
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
165165
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
166-
CFLAGS="$$(CFG_GCCISH_CFLAGS)" \
167-
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \
168166
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
169167
OS=mingw \
170168
V=$$(VERBOSE)

mk/target.mk

+2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ endif
8686
$$(TBIN$(1)_T_$(2)_H_$(3))/:
8787
mkdir -p $$@
8888

89+
ifneq ($(CFG_LIBDIR),bin)
8990
$$(TLIB$(1)_T_$(2)_H_$(3))/:
9091
mkdir -p $$@
92+
endif
9193

9294
endef
9395

0 commit comments

Comments
 (0)