diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2016-02-20 17:57:14 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2016-02-21 15:32:43 +0100 |
| commit | 8ade08041294446fd44978a9a068cb3b30ca4001 (patch) | |
| tree | beb295111a3c44689e48b931f38c4bc8209532bf /src/libstd/lib.rs | |
| parent | 2d14b39204e648a219a17335e712c3fb14666a07 (diff) | |
| download | rust-8ade08041294446fd44978a9a068cb3b30ca4001.tar.gz rust-8ade08041294446fd44978a9a068cb3b30ca4001.zip | |
Fix liballoc dependencies
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 416c01b539f..d8ecddcbe42 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -269,6 +269,10 @@ #![feature(vec_push_all)] #![feature(zero_one)] +// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc +// might be unavailable or disabled +#![cfg_attr(stage0, feature(alloc_system))] + // Don't link to std. We are std. #![no_std] @@ -295,6 +299,9 @@ extern crate alloc; extern crate rustc_unicode; extern crate libc; +#[cfg(stage0)] +extern crate alloc_system; + // Make std testable by not duplicating lang items and other globals. See #2912 #[cfg(test)] extern crate std as realstd; |