bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Apply review comments.

Browse source
This commit is contained in:
Jakub Beránek 2024-06-22 09:35:39 +02:00
parent 87d2e61428
commit 0bd58d8122
No known key found for this signature in database
GPG key ID: 909CD0D26483516B
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/src/core/build_steps/perf.rs
View file

@ -22,7 +22,7 @@ Consider setting `rust.debuginfo-level = 1` in `config.toml`."#);
let sysroot = builder.ensure(Sysroot::new(compiler));
let rustc = sysroot.join("bin/rustc");
let results_dir = builder.build.out.join("rustc-perf");
let results_dir = builder.build.tempdir().join("rustc-perf");
let mut cmd = Command::new(collector);
let cmd = cmd

8
src/bootstrap/src/core/build_steps/tool.rs
View file

@ -129,7 +129,7 @@ impl Step for ToolBuild {
if tool == "tidy" {
tool = "rust-tidy";
}
copy_tool_bin(builder, self.compiler, self.target, self.mode, tool)
copy_link_tool_bin(builder, self.compiler, self.target, self.mode, tool)
}
}
}
@ -214,9 +214,9 @@ pub fn prepare_tool_cargo(
cargo
}
/// Copies a built tool binary with the given `name` from the build directory to the
/// Links a built tool binary with the given `name` from the build directory to the
/// tools directory.
fn copy_tool_bin(
fn copy_link_tool_bin(
builder: &Builder<'_>,
compiler: Compiler,
target: TargetSelection,
@ -413,7 +413,7 @@ impl Step for RustcPerf {
let collector_bin = builder.ensure(tool.clone());
// We also need to symlink the `rustc-fake` binary to the corresponding directory,
// because `collector` expects it in the same directory.
copy_tool_bin(builder, tool.compiler, tool.target, tool.mode, "rustc-fake");
copy_link_tool_bin(builder, tool.compiler, tool.target, tool.mode, "rustc-fake");
collector_bin
}