Skip to content

Commit

Permalink
Auto merge of #89631 - camsteffen:clippy-boot-env, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Remove unused clippy bootstrap env vars

Continues rust-lang/rust-clippy#7646
  • Loading branch information
bors committed Oct 9, 2021
2 parents a8f2463 + 848d627 commit f086f47
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ impl Step for Clippy {
let host = self.host;
let compiler = builder.compiler(stage, host);

let clippy = builder
builder
.ensure(tool::Clippy { compiler, target: self.host, extra_features: Vec::new() })
.expect("in-tree tool");
let mut cargo = tool::prepare_tool_cargo(
Expand All @@ -672,14 +672,7 @@ impl Step for Clippy {
cargo.env("RUSTC_TEST_SUITE", builder.rustc(compiler));
cargo.env("RUSTC_LIB_PATH", builder.rustc_libdir(compiler));
let host_libs = builder.stage_out(compiler, Mode::ToolRustc).join(builder.cargo_dir());
let target_libs = builder
.stage_out(compiler, Mode::ToolRustc)
.join(&self.host.triple)
.join(builder.cargo_dir());
cargo.env("HOST_LIBS", host_libs);
cargo.env("TARGET_LIBS", target_libs);
// clippy tests need to find the driver
cargo.env("CLIPPY_DRIVER_PATH", clippy);

cargo.arg("--").args(builder.config.cmd.test_args());

Expand Down

0 comments on commit f086f47

Please sign in to comment.