diff options
| author | bors <bors@rust-lang.org> | 2016-01-14 03:17:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-14 03:17:51 +0000 |
| commit | e1f550ebc299d5eadc073160cd3acb8de6c5d857 (patch) | |
| tree | e17a062030e4c85eef0c2c17522129700c80b5d3 /src/liballoc | |
| parent | 9f6917d4264c423283ba610b4185ace61e77428b (diff) | |
| parent | c5da16012d187f31c2fe870484ba04e361f3ad31 (diff) | |
| download | rust-e1f550ebc299d5eadc073160cd3acb8de6c5d857.tar.gz rust-e1f550ebc299d5eadc073160cd3acb8de6c5d857.zip | |
Auto merge of #30662 - simartin:issue_30592, r=alexcrichton
Fixes https://github.com/rust-lang/rust/issues/30592, a fallout of https://github.com/rust-lang/rust/commit/cd1848a1a60f40f25019e455b1050efd69707604
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)] |