From 1cbbb58d87aca14856a891eb48ce4b58ad5faa2a Mon Sep 17 00:00:00 2001
From: Jeff Olson <olson.jeffery@gmail.com>
Date: Thu, 7 Feb 2013 16:50:43 -0800
Subject: [PATCH] build: change libuv to point at joyent's repo and make
 unpatched build libuv work on mingw

---
 .gitmodules    | 2 +-
 mk/platform.mk | 4 ++--
 src/libuv      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3b2d9a709ac..e840f4adaeb 100644
--- a/.gitmodules
+++ b/.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/mk/platform.mk b/mk/platform.mk
index d2f874561b1..e45b29995a9 100644
--- a/mk/platform.mk
+++ b/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))))
\ No newline at end of file
+  $(eval $(call CFG_MAKE_ASSEMBLER,$(target))))
diff --git a/src/libuv b/src/libuv
index 42cc78fb6b9..da33bba7c04 160000
--- a/src/libuv
+++ b/src/libuv
@@ -1 +1 @@
-Subproject commit 42cc78fb6b9feb0c6f95dd3700f4dff714dc00d6
+Subproject commit da33bba7c04e0873b457a9a4290bed2adf620154