File tree Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Expand file tree Collapse file tree 2 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
8
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9
9
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10
- refs/heads/dist-snap: 326d9661b7cdeb0e429468b378fb2af716a3a955
10
+ refs/heads/dist-snap: 89377eafe163eee7f636a758ef117399f58c3598
11
11
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
12
12
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
13
13
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
Original file line number Diff line number Diff line change @@ -163,14 +163,16 @@ endif
163
163
ifdef CFG_WINDOWSY_$(1)
164
164
$$(LIBUV_LIB_$(1 ) ) : $$(LIBUV_DEPS )
165
165
$$(Q )$$(MAKE ) -C $$(S ) src/libuv/ \
166
+ CFLAGS=" $$ (CFG_GCCISH_CFLAGS)" \
167
+ LDFLAGS=" $$ (CFG_GCCISH_LINK_FLAGS)" \
166
168
builddir_name=" $$ (CFG_BUILD_DIR)/rt/$( 1) /libuv" \
167
169
OS=mingw \
168
170
V=$$(VERBOSE )
169
171
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
170
172
$$(LIBUV_LIB_$(1 ) ) : $$(LIBUV_DEPS )
171
173
$$(Q )$$(MAKE ) -C $$(S ) src/libuv/ \
172
- CFLAGS=" $$ (LIBUV_FLAGS_$$ (HOST_$( 1) )) $$ (SNAP_DEFINES)" \
173
- LDFLAGS=" $$ (LIBUV_FLAGS_$$ (HOST_$( 1) ))" \
174
+ CFLAGS=" $$ (CFG_GCCISH_CFLAGS) $$ ( LIBUV_FLAGS_$$ (HOST_$( 1) )) $$ (SNAP_DEFINES)" \
175
+ LDFLAGS=" $$ (CFG_GCCISH_LINK_FLAGS) $$ ( LIBUV_FLAGS_$$ (HOST_$( 1) ))" \
174
176
CC=" $$ (CC_$( 1) )" \
175
177
CXX=" $$ (CXX_$( 1) )" \
176
178
AR=" $$ (AR_$( 1) )" \
@@ -181,8 +183,8 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
181
183
else
182
184
$$(LIBUV_LIB_$(1 ) ) : $$(LIBUV_DEPS )
183
185
$$(Q )$$(MAKE ) -C $$(S ) src/libuv/ \
184
- CFLAGS=" $$ (LIBUV_FLAGS_$$ (HOST_$( 1) )) $$ (SNAP_DEFINES)" \
185
- LDFLAGS=" $$ (LIBUV_FLAGS_$$ (HOST_$( 1) ))" \
186
+ CFLAGS=" $$ (CFG_GCCISH_CFLAGS) $$ ( LIBUV_FLAGS_$$ (HOST_$( 1) )) $$ (SNAP_DEFINES)" \
187
+ LDFLAGS=" $$ (CFG_GCCISH_LINK_FLAGS) $$ ( LIBUV_FLAGS_$$ (HOST_$( 1) ))" \
186
188
CC=" $$ (CC_$( 1) )" \
187
189
CXX=" $$ (CXX_$( 1) )" \
188
190
AR=" $$ (AR_$( 1) )" \
You can’t perform that action at this time.
0 commit comments