From db38ab9ad9dd5f5f2407129c44eb06e94fa7974b Mon Sep 17 00:00:00 2001 From: Young-il Choi Date: Tue, 7 May 2013 15:26:55 +0900 Subject: [PATCH 1/2] mk: rt.mk regression patch for mingw32 after #6176 --- mk/rt.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/mk/rt.mk b/mk/rt.mk index 30dda2fb276c9..ab91dca62182c 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -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) From 930908aa90af3635af3744b08bf2aaaee4e3b381 Mon Sep 17 00:00:00 2001 From: Young-il Choi Date: Tue, 7 May 2013 15:29:05 +0900 Subject: [PATCH 2/2] mk: target.mk host.mk fix for duplicated rules of mingw32 after #6235 --- mk/host.mk | 2 ++ mk/target.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mk/host.mk b/mk/host.mk index 0c00a7e1d6469..92c6ffbbe172f 100644 --- a/mk/host.mk +++ b/mk/host.mk @@ -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 diff --git a/mk/target.mk b/mk/target.mk index 2223531c3ec5e..3cecc3940e62f 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -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