diff options
| author | bors <bors@rust-lang.org> | 2018-08-02 10:28:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-08-02 10:28:42 +0000 |
| commit | 76aeeefdc2d52830c1381dbce289769112e0c1ef (patch) | |
| tree | 0bb97c890963212ec81ef4f04181cdc168fe4ab4 /src | |
| parent | 02a369a5c8a9be35ddfa17b8af1d51459c4a6bc6 (diff) | |
| parent | 872395a38ccced1b5e8d69cecf011ffb5a5f3ed8 (diff) | |
| download | rust-76aeeefdc2d52830c1381dbce289769112e0c1ef.tar.gz rust-76aeeefdc2d52830c1381dbce289769112e0c1ef.zip | |
Auto merge of #52906 - RalfJung:jemalloc, r=alexcrichton
enable jemalloc assertions when configured to do so This is essentially a re-submission of the functional part of https://github.com/rust-lang/rust/pull/43648. I was unable to reproduce the issue I had back then, maybe something changed somewhere to no longer trigger the assertion. Fixes https://github.com/rust-lang/rust/issues/44152
Diffstat (limited to 'src')
| -rw-r--r-- | src/liballoc_jemalloc/build.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/liballoc_jemalloc/build.rs b/src/liballoc_jemalloc/build.rs index 0aa46dc6d20..fbda425a70b 100644 --- a/src/liballoc_jemalloc/build.rs +++ b/src/liballoc_jemalloc/build.rs @@ -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))); |