about summary refs log tree commit diff
path: root/src/liballoc_jemalloc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-06-29 20:04:14 +0000
committerbors <bors@rust-lang.org>2017-06-29 20:04:14 +0000
commit3bfc18a9619a5151ff4f11618db9cd882996ba6f (patch)
treeb83cd1eae1234700f48ddec1fad3ed9f556e5a57 /src/liballoc_jemalloc
parent686ec28ceaedb2a26423d48b90da210d491915cc (diff)
parent8aa39ad3d8a104b4676186df959cc4b248495381 (diff)
downloadrust-3bfc18a9619a5151ff4f11618db9cd882996ba6f.tar.gz
rust-3bfc18a9619a5151ff4f11618db9cd882996ba6f.zip
Auto merge of #42900 - sfackler:jemalloc-tweak, r=alexcrichton
Stop disabling fill in jemalloc

The underlying bug has been fixed for over 2 years!

r? @alexcrichton
Diffstat (limited to 'src/liballoc_jemalloc')
-rw-r--r--src/liballoc_jemalloc/build.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs
index 23677bca9f1..085f62f4b0f 100644
--- a/src/liballoc_jemalloc/build.rs
+++ b/src/liballoc_jemalloc/build.rs
@@ -137,8 +137,6 @@ fn main() {
         cmd.arg("--enable-debug");
     }
 
-    // Turn off broken quarantine (see jemalloc/jemalloc#161)
-    cmd.arg("--disable-fill");
     cmd.arg(format!("--host={}", build_helper::gnu_target(&target)));
     cmd.arg(format!("--build={}", build_helper::gnu_target(&host)));