build: change libuv to point at joyent's repo and make unpatched build libuv work on mingw
This commit is contained in:
parent
73507c1961
commit
1cbbb58d87
|
@ -3,4 +3,4 @@
|
||||||
url = git://github.com/brson/llvm.git
|
url = git://github.com/brson/llvm.git
|
||||||
[submodule "src/libuv"]
|
[submodule "src/libuv"]
|
||||||
path = src/libuv
|
path = src/libuv
|
||||||
url = git://github.com/olsonjeffery/libuv.git
|
url = git://github.com/joyent/libuv.git
|
||||||
|
|
|
@ -198,7 +198,7 @@ else
|
||||||
endif
|
endif
|
||||||
CFG_RUN_TARG=$(call CFG_RUN,$(HLIB$(1)_H_$(CFG_HOST_TRIPLE)),$(2))
|
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_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
|
ifndef CFG_ENABLE_MINGW_CROSS
|
||||||
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
|
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
|
||||||
|
@ -322,4 +322,4 @@ define CFG_MAKE_ASSEMBLER
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(foreach target,$(CFG_TARGET_TRIPLES),\
|
$(foreach target,$(CFG_TARGET_TRIPLES),\
|
||||||
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))
|
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 42cc78fb6b9feb0c6f95dd3700f4dff714dc00d6
|
Subproject commit da33bba7c04e0873b457a9a4290bed2adf620154
|
Loading…
Reference in New Issue