Re-add libuv as a submodule.

.gitmodules

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

Makefile.in

@@ -48,12 +48,12 @@
 
 include config.mk
 OUR_MKFILES := Makefile config.mk $(wildcard $(CFG_SRC_DIR)/mk/*.mk)
-3RDPARTY_MKFILES := $(CFG_SRC_DIR)/src/rt/libuv/Makefile \
-                    $(wildcard $(CFG_SRC_DIR)/src/rt/libuv/*.mk)
+3RDPARTY_MKFILES := $(CFG_SRC_DIR)/src/libuv/Makefile \
+                    $(wildcard $(CFG_SRC_DIR)/src/libuv/*.mk)
 GEN_MKFILES := $(wildcard $(CFG_SRC_DIR)/mk/libuv/*/*/*) \
-               $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*) \
-               $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*) \
-               $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/rt/libuv/*)
+               $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/libuv/*) \
+               $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/libuv/*) \
+               $(wildcard $(CFG_SRC_DIR)/mk/libuv/mac/src/libuv/*)
 
 MKFILES := $(OUR_MKFILES) $(3RDPARTY_MKFILES) $(GEN_MKFILES)
 

mk/clean.mk

@@ -28,9 +28,9 @@ clean-misc:
 	$(Q)rm -f $(GENERATED)
 	$(Q)rm -f rustllvm/$(CFG_RUSTLLVM) rustllvm/rustllvmbits.a
 	$(Q)rm -f rt/$(CFG_RUNTIME)
-	$(Q)rm -f rt/libuv/uv.a
-	$(Q)rm -Rf $(wildcard rt/libuv/src/*/*)
-	$(Q)rm -f $(wildcard rt/libuv/src/*.o)
+	$(Q)rm -f libuv/uv.a
+	$(Q)rm -Rf $(wildcard libuv/src/*/*)
+	$(Q)rm -f $(wildcard libuv/src/*.o)
 	$(Q)rm -f test/run_pass_stage2.rc test/run_pass_stage2_driver.rs
 	$(Q)rm -Rf $(PKG_NAME)-*.tar.gz dist
 	$(Q)rm -f $(foreach ext,o a d bc s exe,$(wildcard stage*/*.$(ext)))
@@ -44,7 +44,7 @@ clean-misc:
                  aux cp fn ky log pdf html pg toc tp vr cps, \
                  $(wildcard doc/*.$(ext)))
 	$(Q)rm -Rf doc/version.texi
-	$(Q)rm -rf rt/libuv
+	$(Q)rm -rf libuv
 
 define CLEAN_STAGE_N
 
@@ -87,4 +87,4 @@ endif
 endef
 
 $(foreach target, $(CFG_TARGET_TRIPLES), \
- $(eval $(call DEF_CLEAN_LLVM_TARGET,$(target))))
+ $(eval $(call DEF_CLEAN_LLVM_TARGET,$(target))))

mk/dist.mk

@@ -20,12 +20,12 @@ PKG_3RDPARTY := rt/valgrind.h rt/memcheck.h \
                 rt/bigint/bigint_ext.cpp rt/bigint/low_primes.h
 
 PKG_UV := \
-                $(wildcard $(S)src/rt/libuv/*) \
-                $(wildcard $(S)src/rt/libuv/include/*) \
-                $(wildcard $(S)src/rt/libuv/include/*/*) \
-                $(wildcard $(S)src/rt/libuv/src/*) \
-                $(wildcard $(S)src/rt/libuv/src/*/*) \
-                $(wildcard $(S)src/rt/libuv/src/*/*/*)
+                $(wildcard $(S)src/libuv/*) \
+                $(wildcard $(S)src/libuv/include/*) \
+                $(wildcard $(S)src/libuv/include/*/*) \
+                $(wildcard $(S)src/libuv/src/*) \
+                $(wildcard $(S)src/libuv/src/*/*) \
+                $(wildcard $(S)src/libuv/src/*/*/*)
 
 PKG_PP_EXAMPLES = $(wildcard $(S)src/test/pretty/*.pp)
 

mk/libuv/ia32/mac/Makefile

@@ -329,23 +329,23 @@ $(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
 
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,src/rt/libuv/run-benchmarks.target.mk)))),)
-  include src/rt/libuv/run-benchmarks.target.mk
+                 $(join ^,src/libuv/run-benchmarks.target.mk)))),)
+  include src/libuv/run-benchmarks.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,src/rt/libuv/run-tests.target.mk)))),)
-  include src/rt/libuv/run-tests.target.mk
+                 $(join ^,src/libuv/run-tests.target.mk)))),)
+  include src/libuv/run-tests.target.mk
 endif
 ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
     $(findstring $(join ^,$(prefix)),\
-                 $(join ^,src/rt/libuv/uv.target.mk)))),)
-  include src/rt/libuv/uv.target.mk
+                 $(join ^,src/libuv/uv.target.mk)))),)
+  include src/libuv/uv.target.mk
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = ./src/rt/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/rt/libuv/uv.gyp
-#Makefile: $(srcdir)/src/rt/libuv/uv.gyp
+cmd_regen_makefile = ./src/libuv/build/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." "--depth=." "--generator-output=mk/libuv/ia32/mac" "-Dlibrary=static_library" "-Dtarget_arch=ia32" "-DOS=mac" src/libuv/uv.gyp
+Makefile: $(srcdir)/src/libuv/uv.gyp
 #	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included