diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-08-31 07:07:54 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-08-31 18:20:52 -0700 |
| commit | 9e5a7e94725529fd8cbe1883238d7c22d9faca3e (patch) | |
| tree | 33b9305988a4c829d5203d143012799f88c839d8 /src/libstd | |
| parent | 7a2a8d7d60aa9f12dc44f51e1324573e1bd6f9b2 (diff) | |
| download | rust-9e5a7e94725529fd8cbe1883238d7c22d9faca3e.tar.gz rust-9e5a7e94725529fd8cbe1883238d7c22d9faca3e.zip | |
Bring back stage0 allocator logic on MSVC
I think there may still be bugs preventing its removal..
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 9d17e142f6c..33bf0d68126 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -322,9 +322,12 @@ // 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"), +// FIXME(#44236) shouldn't need MSVC logic +#![cfg_attr(all(not(target_env = "msvc"), + any(stage0, feature = "force_alloc_system")), feature(global_allocator))] -#[cfg(any(stage0, feature = "force_alloc_system"))] +#[cfg(all(not(target_env = "msvc"), + any(stage0, feature = "force_alloc_system")))] #[global_allocator] static ALLOC: alloc_system::System = alloc_system::System; |