Skip to content

Commit 7777316

Browse files
committed
---
yaml --- r: 63153 b: refs/heads/snap-stage3 c: cf536e0 h: refs/heads/master i: 63151: 994b31c v: v3
1 parent 152749a commit 7777316

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e9c309c0e58808cb38a24de5647880f8659c4041
4+
refs/heads/snap-stage3: cf536e013a9967f071fd038aec7ce60332e77710
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/rt.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,15 @@ endif
212212

213213
$$(JEMALLOC_LIB_$(1)_$(2)):
214214
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
215-
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1)
215+
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \
216+
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
217+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
218+
CC="$$(CC_$(1))" \
219+
CXX="$$(CXX_$(1))" \
220+
AR="$$(AR_$(1))"
216221
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
217222

223+
218224
# These could go in rt.mk or rustllvm.mk, they're needed for both.
219225

220226
# This regexp has a single $, escaped twice

0 commit comments

Comments
 (0)