bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix cross-crate global allocators on windows

Browse source
This commit is contained in:
Aidan Hobson Sayers 2017-08-10 14:40:42 +01:00
parent 458ba7aeb5
commit 56a07539c0
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/libstd/lib.rs
View file

@ -319,12 +319,18 @@
#![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`).
// crate the stage0 compiler will pick by default is enabled (e.g.
// 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"))]
// The not(stage0+msvc) gates will only last until the next stage0 bump
#![cfg_attr(all(
not(all(stage0, target_env = "msvc")),
any(stage0, feature = "force_alloc_system")),
feature(global_allocator))]
#[cfg(all(
not(all(stage0, target_env = "msvc")),
any(stage0, feature = "force_alloc_system")))]
#[global_allocator]
static ALLOC: alloc_system::System = alloc_system::System;