Skip to content

Commit 630e02f

Browse files
committed
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.
2 parents faf477a + 16fc74c commit 630e02f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/liballoc_jemalloc/build.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,11 @@ fn main() {
111111
cmd.arg("--with-jemalloc-prefix=je_");
112112
}
113113

114-
if cfg!(feature = "debug-jemalloc") {
115-
cmd.arg("--enable-debug");
116-
}
114+
// FIXME: building with jemalloc assertions is currently broken.
115+
// See <https://github.com/rust-lang/rust/issues/44152>.
116+
//if cfg!(feature = "debug") {
117+
// cmd.arg("--enable-debug");
118+
//}
117119

118120
cmd.arg(format!("--host={}", build_helper::gnu_target(&target)));
119121
cmd.arg(format!("--build={}", build_helper::gnu_target(&host)));

0 commit comments

Comments
 (0)