Skip to content

Commit 4a8df21

Browse files
olsonjefferyKerra Olson
authored andcommitted
---
yaml --- r: 44357 b: refs/heads/master c: a74296a h: refs/heads/master i: 44355: ccf430f v: v3
1 parent 811f5b9 commit 4a8df21

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 4942fe9c1e92ae90878910337011507b07073975
2+
refs/heads/master: a74296a39fe9988516dde322a61374c65fc86b25
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/mk/rt.mk

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,16 +158,19 @@ LIBUV_DEPS := $$(wildcard \
158158
endif
159159

160160
ifdef CFG_WINDOWSY
161-
LIBUV_OS := 'OS=mingw'
161+
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
162+
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
163+
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
164+
OS=mingw \
165+
V=$$(VERBOSE)
162166
else
163-
LIBUV_OS :=
164-
endif
165-
166167
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
167168
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
168169
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
169-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" $$(LIBUV_OS) \
170+
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
170171
V=$$(VERBOSE)
172+
endif
173+
171174

172175
# These could go in rt.mk or rustllvm.mk, they're needed for both.
173176

0 commit comments

Comments
 (0)