Skip to content

Commit f086f47

Browse files
committed
Auto merge of #89631 - camsteffen:clippy-boot-env, r=Mark-Simulacrum
Remove unused clippy bootstrap env vars Continues rust-lang/rust-clippy#7646
2 parents a8f2463 + 848d627 commit f086f47

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

src/bootstrap/test.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ impl Step for Clippy {
653653
let host = self.host;
654654
let compiler = builder.compiler(stage, host);
655655

656-
let clippy = builder
656+
builder
657657
.ensure(tool::Clippy { compiler, target: self.host, extra_features: Vec::new() })
658658
.expect("in-tree tool");
659659
let mut cargo = tool::prepare_tool_cargo(
@@ -672,14 +672,7 @@ impl Step for Clippy {
672672
cargo.env("RUSTC_TEST_SUITE", builder.rustc(compiler));
673673
cargo.env("RUSTC_LIB_PATH", builder.rustc_libdir(compiler));
674674
let host_libs = builder.stage_out(compiler, Mode::ToolRustc).join(builder.cargo_dir());
675-
let target_libs = builder
676-
.stage_out(compiler, Mode::ToolRustc)
677-
.join(&self.host.triple)
678-
.join(builder.cargo_dir());
679675
cargo.env("HOST_LIBS", host_libs);
680-
cargo.env("TARGET_LIBS", target_libs);
681-
// clippy tests need to find the driver
682-
cargo.env("CLIPPY_DRIVER_PATH", clippy);
683676

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

0 commit comments

Comments
 (0)