mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-02 15:32:06 +00:00
Potential fix for Win32 build
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.
This commit is contained in:
parent
3446f28879
commit
2ec323e4c3
1
mk/rt.mk
1
mk/rt.mk
@ -217,7 +217,6 @@ $$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS)
|
|||||||
CXX="$$(CXX_$(1))" \
|
CXX="$$(CXX_$(1))" \
|
||||||
AR="$$(AR_$(1))" \
|
AR="$$(AR_$(1))" \
|
||||||
V=$$(VERBOSE)
|
V=$$(VERBOSE)
|
||||||
$$(Q)cp $$(S)src/libuv/libuv.a $$@
|
|
||||||
else ifeq ($(OSTYPE_$(1)), apple-ios) # iOS
|
else ifeq ($(OSTYPE_$(1)), apple-ios) # iOS
|
||||||
$$(LIBUV_XCODEPROJ_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1))
|
$$(LIBUV_XCODEPROJ_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1))
|
||||||
cp -rf $(S)src/libuv/ $$(LIBUV_BUILD_DIR_$(1))
|
cp -rf $(S)src/libuv/ $$(LIBUV_BUILD_DIR_$(1))
|
||||||
|
Loading…
Reference in New Issue
Block a user