Auto merge of #117197 - Zalathar:demangler, r=onur-ozkan

Avoid unnecessary builds/rebuilds of `rust-demangler`

This is a combination of two loosely-related changes:

- Don't build `rust-demangler` as a dependency of `tests/run-make`, because after #112300 none of the remaining run-make tests actually use it. (If future run-make tests ever do need the demangler, it'll be easy to add it back.)
- For `tests/run-coverage`, build the demangler with the stage 0 compiler instead of the current-stage compiler. This avoids having to uselessly rebuild the demangler after modifying and rebuilding the compiler itself.
This commit is contained in:
bors 2023-10-28 01:04:35 +00:00
commit c6eb61a97f
2 changed files with 4 additions and 6 deletions

View File

@ -1567,10 +1567,12 @@ fn run(self, builder: &Builder<'_>) {
cmd.arg("--coverage-dump-path").arg(coverage_dump);
}
if mode == "run-make" || mode == "run-coverage" {
if mode == "run-coverage" {
// The demangler doesn't need the current compiler, so we can avoid
// unnecessary rebuilds by using the bootstrap compiler instead.
let rust_demangler = builder
.ensure(tool::RustDemangler {
compiler,
compiler: compiler.with_stage(0),
target: compiler.host,
extra_features: Vec::new(),
})

View File

@ -3546,10 +3546,6 @@ fn run_rmake_test(&self) {
cmd.env("RUSTDOC", cwd.join(rustdoc));
}
if let Some(ref rust_demangler) = self.config.rust_demangler_path {
cmd.env("RUST_DEMANGLER", cwd.join(rust_demangler));
}
if let Some(ref node) = self.config.nodejs {
cmd.env("NODE", node);
}