diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2024-06-22 09:35:39 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2024-06-22 09:35:39 +0200 |
| commit | 0bd58d8122aa6b6a1ed0a2db6c6a4c5f55ae75c2 (patch) | |
| tree | 1891a59b3445a2b654d7d40dd2da956f318a70de | |
| parent | 87d2e61428fb5db0781ab008714a7b52d022a082 (diff) | |
| download | rust-0bd58d8122aa6b6a1ed0a2db6c6a4c5f55ae75c2.tar.gz rust-0bd58d8122aa6b6a1ed0a2db6c6a4c5f55ae75c2.zip | |
Apply review comments.
| -rw-r--r-- | src/bootstrap/src/core/build_steps/perf.rs | 2 | ||||
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/src/core/build_steps/perf.rs b/src/bootstrap/src/core/build_steps/perf.rs index 16d71808bd8..9d70ca6bd71 100644 --- a/src/bootstrap/src/core/build_steps/perf.rs +++ b/src/bootstrap/src/core/build_steps/perf.rs @@ -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 diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 03e77c46b60..7e99de9d477 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -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 } |
