rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Expose a feature to force use of alloc_system, teach rustbuild

Browse Source 
This fixes jemalloc-less local rebuilds, where we tell cargo that
we're actually stage1
This commit is contained in:
Aidan Hobson Sayers
2017-01-15 22:33:58 +00:00
parent b0c52c587f
commit 70d2372ada
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstd/lib.rs
View File

@@ -219,9 +219,10 @@
// Tell the compiler to link to either panic_abort or panic_unwind
#![needs_panic_runtime]
// Always use alloc_system during stage0 since jemalloc might be unavailable or
// disabled (Issue #30592)
#![cfg_attr(stage0, feature(alloc_system))]
// Always use alloc_system during stage0 since we don't know if the alloc_*
// crate the stage0 compiler will pick by default is available (most
// obviously, if the user has disabled jemalloc in `./configure`).
#![cfg_attr(any(stage0, feature = "force_alloc_system"), feature(alloc_system))]
// Turn warnings into errors, but only after stage0, where it can be useful for
// code to emit warnings during language transitions
@@ -333,7 +334,7 @@ extern crate libc;
// We always need an unwinder currently for backtraces
extern crate unwind;
#[cfg(stage0)]
#[cfg(any(stage0, feature = "force_alloc_system"))]
extern crate alloc_system;
// compiler-rt intrinsics