---

yaml
---
r: 44355
b: refs/heads/master
c: a38b166
h: refs/heads/master
i:
  44353: 6a01fc6
  44351: 60b58f7
v: v3

Author: olsonjeffery

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: dfcdb6eb729fa51cac47f219a90a9f894819f343
+refs/heads/master: a38b16651f0d900b1f1ed3b251488922fccd1f71
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/mk/rt.mk

@@ -157,16 +157,17 @@ LIBUV_DEPS := $$(wildcard \
               $$(S)src/libuv/*/*/*/*)
 endif
 
+ifdef CFG_WINDOWSY
+LIBUV_OS := 'OS=mingw'
+else
+LIBUV_OS :=
+endif
+
 $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
 	$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
 		CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
-        LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
-		CC="$$(CFG_GCCISH_CROSS)$$(CC)" \
-		CXX="$$(CFG_GCCISH_CROSS)$$(CXX)" \
-		AR="$$(CFG_GCCISH_CROSS)$$(AR)" \
-		BUILDTYPE=Release \
-		builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
-		V=$$(VERBOSE) FLOCK= 
+		builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" $$(LIBUV_OS) \
+		V=$$(VERBOSE)
 
 # These could go in rt.mk or rustllvm.mk, they're needed for both.