diff options
| author | Simon Martin <simartin@users.sourceforge.net> | 2015-12-31 18:13:39 +0100 |
|---|---|---|
| committer | Simon Martin <simartin@users.sourceforge.net> | 2016-01-13 21:15:00 +0100 |
| commit | c5da16012d187f31c2fe870484ba04e361f3ad31 (patch) | |
| tree | 72795aaed481b3fb27cb709f677cab7a8d50e9e4 /src/liballoc | |
| parent | 1586005a1d15e7d26b6c46a33e7a9643de9a77ac (diff) | |
| download | rust-c5da16012d187f31c2fe870484ba04e361f3ad31.tar.gz rust-c5da16012d187f31c2fe870484ba04e361f3ad31.zip | |
Issue #30592: Restore build in --disable-jemalloc mode.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 93b84cdedd4..69f74ba73bb 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -95,8 +95,15 @@ #![feature(needs_allocator)] +// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc +// might be unavailable or disabled +#![cfg_attr(stage0, feature(alloc_system))] + #![cfg_attr(test, feature(test, rustc_private, box_heap))] +#[cfg(stage0)] +extern crate alloc_system; + // Allow testing this library #[cfg(test)] |