about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-07-17 18:03:31 -0600
committerMark Simulacrum <mark.simulacrum@gmail.com>2017-07-20 11:24:37 -0600
commitba1fc82fe4377dd7a7898b8354dcf7e2b3a0e685 (patch)
tree098ca193e962807d6e309b88926d9f421947d649 /src/bootstrap
parent741486885334f603f0ae4050bebdeb347c6720ff (diff)
downloadrust-ba1fc82fe4377dd7a7898b8354dcf7e2b3a0e685.tar.gz
rust-ba1fc82fe4377dd7a7898b8354dcf7e2b3a0e685.zip
Remove outdated code.
Relevant sys crates handle this properly.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 50ecdeb988a..9993392ac46 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -399,19 +399,6 @@ impl<'a> Builder<'a> {
             cargo.env("RUSTC_SAVE_ANALYSIS", "api".to_string());
         }
 
-        // When being built Cargo will at some point call `nmake.exe` on Windows
-        // MSVC. Unfortunately `nmake` will read these two environment variables
-        // below and try to intepret them. We're likely being run, however, from
-        // MSYS `make` which uses the same variables.
-        //
-        // As a result, to prevent confusion and errors, we remove these
-        // variables from our environment to prevent passing MSYS make flags to
-        // nmake, causing it to blow up.
-        if cfg!(target_env = "msvc") {
-            cargo.env_remove("MAKE");
-            cargo.env_remove("MAKEFLAGS");
-        }
-
         // Environment variables *required* throughout the build
         //
         // FIXME: should update code to not require this env var