File tree Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Expand file tree Collapse file tree 2 files changed +9
-6
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 4942fe9c1e92ae90878910337011507b07073975
2
+ refs/heads/master: a74296a39fe9988516dde322a61374c65fc86b25
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
5
5
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3
Original file line number Diff line number Diff line change @@ -158,16 +158,19 @@ LIBUV_DEPS := $$(wildcard \
158
158
endif
159
159
160
160
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 )
162
166
else
163
- LIBUV_OS :=
164
- endif
165
-
166
167
$$(LIBUV_LIB_$(1 ) ) : $$(LIBUV_DEPS )
167
168
$$(Q )$$(MAKE ) -C $$(S ) src/libuv/ \
168
169
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" \
170
171
V=$$(VERBOSE )
172
+ endif
173
+
171
174
172
175
# These could go in rt.mk or rustllvm.mk, they're needed for both.
173
176
You can’t perform that action at this time.
0 commit comments