Skip to content

Commit 2ff6b29

Browse files
committed
auto merge of #7041 : Aatch/rust/incoming, r=brson
So this gets jemalloc cross-compiling, on linux at least. Hopefully this gets us one step closer to a green incoming again.
2 parents 8f4f0be + cf536e0 commit 2ff6b29

File tree

3 files changed

+177
-162
lines changed

3 files changed

+177
-162
lines changed

mk/rt.mk

+7-1
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)