diff options
| author | bors <bors@rust-lang.org> | 2013-06-08 01:31:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-08 01:31:18 -0700 |
| commit | 8db1d2cdde6fafdd396d2ce5c5994492d5bcf8cb (patch) | |
| tree | 4f7a02083ad57abf59b9cff8c71f7228f540045e | |
| parent | 1d06aea0b76cc3e466a41cb9b2a6dcde7c197fb2 (diff) | |
| parent | a593d8f67cf2011eed81f746a2c2cedebe66a23c (diff) | |
| download | rust-8db1d2cdde6fafdd396d2ce5c5994492d5bcf8cb.tar.gz rust-8db1d2cdde6fafdd396d2ce5c5994492d5bcf8cb.zip | |
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.
| -rw-r--r-- | mk/rt.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index a14e49a169c..f8fd16c04ec 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -211,7 +211,8 @@ $$(LIBUV_LIB_$(1)_$(2)): $$(LIBUV_DEPS) endif $$(JEMALLOC_LIB_$(1)_$(2)): - cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure --disable-experimental + cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \ + --disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) $$(Q)$$(MAKE) -C $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc # These could go in rt.mk or rustllvm.mk, they're needed for both. |