bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make a disable-jemalloc build work

Browse source 
Fixes #43510
This commit is contained in:
Aidan Hobson Sayers 2017-08-01 15:37:10 +01:00
parent e8f558543b
commit 458ba7aeb5
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstd/lib.rs
View file

@ -318,6 +318,16 @@
#![default_lib_allocator] #![default_lib_allocator]
// 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`).
// `force_alloc_system` is *only* intended as a workaround for local rebuilds
// with a rustc without jemalloc.
#![cfg_attr(any(stage0, feature = "force_alloc_system"), feature(global_allocator))]
#[cfg(any(stage0, feature = "force_alloc_system"))]
#[global_allocator]
static ALLOC: alloc_system::System = alloc_system::System;
// Explicitly import the prelude. The compiler uses this same unstable attribute // Explicitly import the prelude. The compiler uses this same unstable attribute
// to import the prelude implicitly when building crates that depend on std. // to import the prelude implicitly when building crates that depend on std.
#[prelude_import] #[prelude_import]