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

Fixes #30592, a fallout of cd1848a
rust-lang · Jan 14, 2016 · e1f550e · e1f550e
2 parents 9f6917d + c5da160
commit e1f550e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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)]