dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: change libuv to point at joyent's repo and make unpatched build libuv work on mingw

This commit is contained in:
Jeff Olson 2013-02-07 16:50:43 -08:00 committed by Kerra Olson
parent 73507c1961
commit 1cbbb58d87
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -3,4 +3,4 @@
url = git://github.com/brson/llvm.git
[submodule "src/libuv"]
path = src/libuv
url = git://github.com/olsonjeffery/libuv.git
url = git://github.com/joyent/libuv.git

4
mk/platform.mk
View File

@ -198,7 +198,7 @@ else
endif
CFG_RUN_TARG=$(call CFG_RUN,$(HLIB$(1)_H_$(CFG_HOST_TRIPLE)),$(2))
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1),$(3)),$(1))
CFG_LIBUV_LINK_FLAGS=-lWs2_32
CFG_LIBUV_LINK_FLAGS=-lWs2_32 -lpsapi -liphlpapi
ifndef CFG_ENABLE_MINGW_CROSS
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
@ -322,4 +322,4 @@ define CFG_MAKE_ASSEMBLER
endef
$(foreach target,$(CFG_TARGET_TRIPLES),\
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))

2
src/libuv

@ -1 +1 @@
Subproject commit 42cc78fb6b9feb0c6f95dd3700f4dff714dc00d6
Subproject commit da33bba7c04e0873b457a9a4290bed2adf620154