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.
rust-lang · Jun 10, 2013 · 2ff6b29 · 2ff6b29
2 parents 8f4f0be + cf536e0
commit 2ff6b29
Show file tree

Hide file tree

Showing 3 changed files with 177 additions and 162 deletions.
diff --git 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