From 8ade08041294446fd44978a9a068cb3b30ca4001 Mon Sep 17 00:00:00 2001 From: John Kåre Alsaker Date: Sat, 20 Feb 2016 17:57:14 +0100 Subject: Fix liballoc dependencies --- src/libstd/lib.rs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/libstd') 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; -- cgit 1.4.1-3-g733a5