Skip to content

Commit 8db1d2c

Browse files
committed
auto merge of #7007 : thestinger/rust/jemalloc, r=catamorphism
It's still broken because `jemalloc`'s `configure` script doesn't work when the build triple doesn't match the target triple due to missing a way to get the page size. I'm not entirely sure how to pass a hardcoded value to autoconf/configure. This at least gets it a bit further along.
2 parents 1d06aea + a593d8f commit 8db1d2c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mk/rt.mk

+2-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS)
211211
endif
212212

213213
$$(JEMALLOC_LIB_$(1)_$(2)):
214-
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure --disable-experimental
214+
cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \
215+
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1)
215216
$$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc
216217

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

0 commit comments

Comments
 (0)