diff options
| author | James Miller <james@aatch.net> | 2013-06-10 17:21:34 +1200 |
|---|---|---|
| committer | James Miller <james@aatch.net> | 2013-06-10 18:26:24 +1200 |
| commit | cf536e013a9967f071fd038aec7ce60332e77710 (patch) | |
| tree | 26a7b7902a6ed27ed4b4e6b8b9871715ceeed5a1 | |
| parent | e9c309c0e58808cb38a24de5647880f8659c4041 (diff) | |
| download | rust-cf536e013a9967f071fd038aec7ce60332e77710.tar.gz rust-cf536e013a9967f071fd038aec7ce60332e77710.zip | |
Pass the correct build flags to jemalloc
Apparently the standard --build and --host flags don't actually _do_ anything. This re-uses the libuv flags, since they are the same for getting jemalloc to cross-compile
| -rw-r--r-- | mk/rt.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index f8fd16c04ec..91100822f55 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -212,9 +212,15 @@ endif $$(JEMALLOC_LIB_$(1)_$(2)): cd $$(CFG_BUILD_DIR)/rt/$(1)/stage$(2)/jemalloc; $(S)src/rt/jemalloc/configure \ - --disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) + --disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \ + EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ + LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \ + CC="$$(CC_$(1))" \ + CXX="$$(CXX_$(1))" \ + AR="$$(AR_$(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. # This regexp has a single $, escaped twice |