about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-06-03 01:00:55 -0400
committerGitHub <noreply@github.com>2017-06-03 01:00:55 -0400
commit468350003656950d476a70e052b02ca744df921b (patch)
tree01a6c5a1b7ff3956d206b6254feaff5e86fbfd02
parentbef8fbd6db4ba1edf3f4cfbcf5dacb62a4b8c933 (diff)
parent225073eff8799f9d9c3df7565a306ac06f001d45 (diff)
downloadrust-468350003656950d476a70e052b02ca744df921b.tar.gz
rust-468350003656950d476a70e052b02ca744df921b.zip
Rollup merge of #42382 - alexcrichton:remove-rustflags, r=Mark-Simulacrum
rustbuild: Remove RUSTFLAGS logic in rustc shim

This was added in #38072 but I can't recall why and AFAIK Cargo already handles
this. This was discovered through #42146 where passing duplicate flags was
causing problems.
-rw-r--r--src/bootstrap/bin/rustc.rs6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index e11f7bd089f..d048645d4d5 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -232,12 +232,6 @@ fn main() {
             if let Some(rpath) = rpath {
                 cmd.arg("-C").arg(format!("link-args={}", rpath));
             }
-
-            if let Ok(s) = env::var("RUSTFLAGS") {
-                for flag in s.split_whitespace() {
-                    cmd.arg(flag);
-                }
-            }
         }
 
         if target.contains("pc-windows-msvc") {