Skip to content

Commit

Permalink
Auto merge of #43648 - RalfJung:jemalloc-debug, r=alexcrichton
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Aug 29, 2017
2 parents faf477a + 16fc74c commit 630e02f
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/liballoc_jemalloc/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand Down

0 comments on commit 630e02f

Please sign in to comment.