Bring back stage0 allocator logic on MSVC

I think there may still be bugs preventing its removal..
rust-lang · Sep 1, 2017 · 9e5a7e9 · 9e5a7e9
1 parent 7a2a8d7
commit 9e5a7e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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;
 

diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
@@ -65,6 +65,7 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
     "src/rtstartup", // Not sure what to do about this. magic stuff for mingw
 
     // temporary exceptions
+    "src/libstd/lib.rs", // FIXME(#44217)
     "src/libstd/path.rs",
     "src/libstd/f32.rs",
     "src/libstd/f64.rs",