user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #30662 - simartin:issue_30592, r=alexcrichton

Browse source 
Fixes https://github.com/rust-lang/rust/issues/30592, a fallout of cd1848a1a6
This commit is contained in:
bors 2016-01-14 03:17:51 +00:00
commit e1f550ebc2
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/liballoc/lib.rs
View file

@ -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)]