From c5da16012d187f31c2fe870484ba04e361f3ad31 Mon Sep 17 00:00:00 2001
From: Simon Martin <simartin@users.sourceforge.net>
Date: Thu, 31 Dec 2015 18:13:39 +0100
Subject: [PATCH] Issue #30592: Restore build in --disable-jemalloc mode.

---
 src/liballoc/lib.rs | 7 +++++++
 1 file changed, 7 insertions(+)

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