auto merge of rust-lang#18554 : sfackler/rust/jemalloc-fix, r=thestinger

sinistersnare · Nov 3, 2014 · dcc5c3b · dcc5c3b
2 parents b87619e + 711a955
commit dcc5c3b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/mk/main.mk b/mk/main.mk
@@ -100,7 +100,9 @@ endif
 CFG_RUSTC_FLAGS := $(RUSTFLAGS)
 CFG_GCCISH_CFLAGS :=
 CFG_GCCISH_LINK_FLAGS :=
-CFG_JEMALLOC_FLAGS :=
+
+# Turn off broken quarantine (see jemalloc/jemalloc#161)
+CFG_JEMALLOC_FLAGS := --disable-fill
 
 ifdef CFG_DISABLE_OPTIMIZE
   $(info cfg: disabling rustc optimization (CFG_DISABLE_OPTIMIZE))