From 2ec323e4c30c265f35314c0a77f5df5a655cec2f Mon Sep 17 00:00:00 2001 From: Valerii Hiora Date: Mon, 16 Jun 2014 08:48:59 +0300 Subject: [PATCH] Potential fix for Win32 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems in one of rebases I’ve resolved conflicts wrong and left one redundant line, it is absent in current master and it might cause compilation failure by copying file into itself. --- mk/rt.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/mk/rt.mk b/mk/rt.mk index cb6c0fc7e5e..7fc82ef6269 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -217,7 +217,6 @@ $$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) CXX="$$(CXX_$(1))" \ AR="$$(AR_$(1))" \ V=$$(VERBOSE) - $$(Q)cp $$(S)src/libuv/libuv.a $$@ else ifeq ($(OSTYPE_$(1)), apple-ios) # iOS $$(LIBUV_XCODEPROJ_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1)) cp -rf $(S)src/libuv/ $$(LIBUV_BUILD_DIR_$(1))