From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 31 Aug 2017 14:07:54 +0000 (-0700)
Subject: Bring back stage0 allocator logic on MSVC
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=9e5a7e94725529fd8cbe1883238d7c22d9faca3e;p=rust.git

Bring back stage0 allocator logic on MSVC

I think there may still be bugs preventing its removal..
---

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;
 
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index 7011d7f64e7..8092a9e156b 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -65,6 +65,7 @@
     "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",