Skip to content

Commit e1f550e

Browse files
committed
Auto merge of rust-lang#30662 - simartin:issue_30592, r=alexcrichton
Fixes rust-lang#30592, a fallout of rust-lang@cd1848a
2 parents 9f6917d + c5da160 commit e1f550e

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/liballoc/lib.rs

+7
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,15 @@
9595

9696
#![feature(needs_allocator)]
9797

98+
// Issue# 30592: Systematically use alloc_system during stage0 since jemalloc
99+
// might be unavailable or disabled
100+
#![cfg_attr(stage0, feature(alloc_system))]
101+
98102
#![cfg_attr(test, feature(test, rustc_private, box_heap))]
99103

104+
#[cfg(stage0)]
105+
extern crate alloc_system;
106+
100107
// Allow testing this library
101108

102109
#[cfg(test)]

0 commit comments

Comments
 (0)