Rollup merge of #42382 - alexcrichton:remove-rustflags, r=Mark-Simulacrum

frewsxcv · web-flow · commit 468350003656 · 2017-06-03T01:00:55.000-04:00
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.
diff --git 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") {

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,6 @@ fn main() {`
`232`	`232`	`if let Some(rpath) = rpath {`
`233`	`233`	`cmd.arg("-C").arg(format!("link-args={}", rpath));`
`234`	`234`	`}`
`235`		`-`
`236`		`- if let Ok(s) = env::var("RUSTFLAGS") {`
`237`		`- for flag in s.split_whitespace() {`
`238`		`- cmd.arg(flag);`
`239`		`- }`
`240`		`- }`
`241`	`235`	`}`
`242`	`236`
`243`	`237`	`if target.contains("pc-windows-msvc") {`