diff options
| author | bors <bors@rust-lang.org> | 2014-11-03 01:27:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-03 01:27:18 +0000 |
| commit | dcc5c3b31b294a19c369e7b1926528610230686d (patch) | |
| tree | 766d97ed874fadd016d04c150a607b862e29db97 | |
| parent | b87619e2744a64da38996c1a618dc28db746848b (diff) | |
| parent | 711a955e0ccd1827642d52d55d14ee7fe9054961 (diff) | |
| download | rust-dcc5c3b31b294a19c369e7b1926528610230686d.tar.gz rust-dcc5c3b31b294a19c369e7b1926528610230686d.zip | |
auto merge of #18554 : sfackler/rust/jemalloc-fix, r=thestinger
| -rw-r--r-- | mk/main.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mk/main.mk b/mk/main.mk index cd08228978e..181bca69462 100644 --- 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)) |