Skip to content

Commit

Permalink
auto merge of #6295 : yichoi/rust/pull-mingw32, r=brson
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed May 7, 2013
2 parents 45ae340 + 930908a commit 3a34e93
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions mk/host.mk
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,10 @@ $$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
$$(HBIN$(2)_H_$(4))/:
mkdir -p $$@

ifneq ($(CFG_LIBDIR),bin)
$$(HLIB$(2)_H_$(4))/:
mkdir -p $$@
endif

endef

Expand Down
2 changes: 0 additions & 2 deletions mk/rt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ endif
ifdef CFG_WINDOWSY_$(1)
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
CFLAGS="$$(CFG_GCCISH_CFLAGS)" \
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
OS=mingw \
V=$$(VERBOSE)
Expand Down
2 changes: 2 additions & 0 deletions mk/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ endif
$$(TBIN$(1)_T_$(2)_H_$(3))/:
mkdir -p $$@

ifneq ($(CFG_LIBDIR),bin)
$$(TLIB$(1)_T_$(2)_H_$(3))/:
mkdir -p $$@
endif

endef

Expand Down

0 comments on commit 3a34e93

Please sign in to comment.