---

olsonjeffery · Kerra Olson · commit 04b8d6a6f562 · 2013-02-10T11:51:05.000-08:00
yaml --- r: 44359 b: refs/heads/master c: 1cbbb58 h: refs/heads/master i: 44357: 4a8df21 44355: ccf430f 44351: 60b58f7 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 73507c1961f7e8f5b6aef2a6d15867360906cd7f
+refs/heads/master: 1cbbb58d87aca14856a891eb48ce4b58ad5faa2a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
diff --git a/trunk/.gitmodules b/trunk/.gitmodules
@@ -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
diff --git a/trunk/mk/platform.mk b/trunk/mk/platform.mk
@@ -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))))
diff --git a/trunk/src/libuv b/trunk/src/libuv
@@ -1 +1 @@
-Subproject commit 42cc78fb6b9feb0c6f95dd3700f4dff714dc00d6
+Subproject commit da33bba7c04e0873b457a9a4290bed2adf620154

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 42cc78fb6b9feb0c6f95dd3700f4dff714dc00d6`
	`1`	`+Subproject commit da33bba7c04e0873b457a9a4290bed2adf620154`