Skip to content

Commit

Permalink
Rollup merge of rust-lang#42382 - alexcrichton:remove-rustflags, r=Ma…
Browse files Browse the repository at this point in the history
…rk-Simulacrum

rustbuild: Remove RUSTFLAGS logic in rustc shim

This was added in rust-lang#38072 but I can't recall why and AFAIK Cargo already handles
this. This was discovered through rust-lang#42146 where passing duplicate flags was
causing problems.
  • Loading branch information
frewsxcv authored Jun 3, 2017
2 parents bef8fbd + 225073e commit 4683500
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/bootstrap/bin/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down

0 comments on commit 4683500

Please sign in to comment.