summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-10-20 19:04:42 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-11-02 06:52:56 -0700
commit61e89446ef6e115630faa75c985c599d739f7586 (patch)
tree8437a16450309e1ac5174b8417bec2e0e9b99c36 /src/libstd/lib.rs
parentd0c869c323289c5ec4df83e1c9091fa0b3e2fc07 (diff)
downloadrust-61e89446ef6e115630faa75c985c599d739f7586.tar.gz
rust-61e89446ef6e115630faa75c985c599d739f7586.zip
Remove all jemalloc-related content
This commit removes all jemalloc related submodules, configuration, etc,
from the bootstrap, from the standard library, and from the compiler.
This will be followed up with a change to use jemalloc specifically as
part of rustc on blessed platforms.
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index ab3e97d1d92..b55d12e4c8d 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -313,14 +313,7 @@
 
 #![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 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.
-// FIXME(#44236) shouldn't need MSVC logic
-#[cfg(all(not(target_env = "msvc"),
-          any(all(stage0, not(test)), feature = "force_alloc_system")))]
+#[cfg(stage0)]
 #[global_allocator]
 static ALLOC: alloc_system::System = alloc_system::System;