Skip to content

Commit

Permalink
Auto merge of #52906 - RalfJung:jemalloc, r=alexcrichton
Browse files Browse the repository at this point in the history
enable jemalloc assertions when configured to do so

This is essentially a re-submission of the functional part of #43648. I was unable to reproduce the issue I had back then, maybe something changed somewhere to no longer trigger the assertion.

Fixes #44152
  • Loading branch information
bors committed Aug 2, 2018
2 parents 02a369a + 872395a commit 76aeeef
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions src/liballoc_jemalloc/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,10 @@ fn main() {
cmd.arg("--with-jemalloc-prefix=je_");
}

// 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");
//}
if cfg!(feature = "debug") {
// Enable jemalloc assertions.
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 76aeeef

Please sign in to comment.