Skip to content

Commit

Permalink
Make a disable-jemalloc build work
Browse files Browse the repository at this point in the history
Fixes #43510
  • Loading branch information
aidanhs committed Aug 7, 2017
1 parent e8f5585 commit 458ba7a
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions src/libstd/lib.rs
Expand Up @@ -318,6 +318,16 @@

#![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
// to import the prelude implicitly when building crates that depend on std.
#[prelude_import]
Expand Down

0 comments on commit 458ba7a

Please sign in to comment.