Skip to content

Commit 1cbbb58

Browse files
olsonjefferyKerra Olson
authored andcommitted
build: change libuv to point at joyent's repo and make unpatched build libuv work on mingw
1 parent 73507c1 commit 1cbbb58

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
url = git://github.com/brson/llvm.git
44
[submodule "src/libuv"]
55
path = src/libuv
6-
url = git://github.com/olsonjeffery/libuv.git
6+
url = git://github.com/joyent/libuv.git

mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ else
198198
endif
199199
CFG_RUN_TARG=$(call CFG_RUN,$(HLIB$(1)_H_$(CFG_HOST_TRIPLE)),$(2))
200200
CFG_RUN_TEST=$(call CFG_RUN,$(call CFG_TESTLIB,$(1),$(3)),$(1))
201-
CFG_LIBUV_LINK_FLAGS=-lWs2_32
201+
CFG_LIBUV_LINK_FLAGS=-lWs2_32 -lpsapi -liphlpapi
202202

203203
ifndef CFG_ENABLE_MINGW_CROSS
204204
CFG_PATH_MUNGE := $(strip perl -i.bak -p \
@@ -322,4 +322,4 @@ define CFG_MAKE_ASSEMBLER
322322
endef
323323

324324
$(foreach target,$(CFG_TARGET_TRIPLES),\
325-
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))
325+
$(eval $(call CFG_MAKE_ASSEMBLER,$(target))))

0 commit comments

Comments
 (0)