about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-29 17:32:13 +0000
committerbors <bors@rust-lang.org>2017-08-29 17:32:13 +0000
commit630e02f25be1e65b316857c5bd8022da0b96db40 (patch)
treea61325681d007c18ce92699575301b271e95fc03
parentfaf477a8c232d0442d16a4025f49d3ae1519131e (diff)
parent16fc74c6a2da63264a8477c84e34291bab10dd29 (diff)
downloadrust-630e02f25be1e65b316857c5bd8022da0b96db40.tar.gz
rust-630e02f25be1e65b316857c5bd8022da0b96db40.zip
Auto merge of #43648 - RalfJung:jemalloc-debug, r=alexcrichton
Fix alloc_jemalloc debug feature

At least, I think that's how it should be.  'debug' is how the feature is called in liballoc_jemalloc/Cargo.toml and libstd/Cargo.toml. I verified this by making the build script panic rather than adding `--enable-debug`, and without this PR, the panic does not occur even when I set `debug-jemalloc = true` in config.toml. With the PR, the panic occurs as expected.

However, I actually have no idea what I am doing here.
-rw-r--r--src/liballoc_jemalloc/build.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs
index 41193f6a41f..c9bea2ecf5e 100644
--- a/src/liballoc_jemalloc/build.rs
+++ b/src/liballoc_jemalloc/build.rs
@@ -111,9 +111,11 @@ fn main() {
         cmd.arg("--with-jemalloc-prefix=je_");
     }
 
-    if cfg!(feature = "debug-jemalloc") {
-        cmd.arg("--enable-debug");
-    }
+    // FIXME: building with jemalloc assertions is currently broken.
+    // See <https://github.com/rust-lang/rust/issues/44152>.
+    //if cfg!(feature = "debug") {
+    //    cmd.arg("--enable-debug");
+    //}
 
     cmd.arg(format!("--host={}", build_helper::gnu_target(&target)));
     cmd.arg(format!("--build={}", build_helper::gnu_target(&host)));