Apply review comments. · rust-lang/rust@0bd58d8 (original) (raw)
File tree
2 files changed
lines changed
- src/bootstrap/src/core/build_steps
2 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -22,7 +22,7 @@ Consider setting `rust.debuginfo-level = 1` in `config.toml`."#); | ||
| 22 | 22 | let sysroot = builder.ensure(Sysroot::new(compiler)); |
| 23 | 23 | let rustc = sysroot.join("bin/rustc"); |
| 24 | 24 | |
| 25 | -let results_dir = builder.build.out.join("rustc-perf"); | |
| 25 | +let results_dir = builder.build.tempdir().join("rustc-perf"); | |
| 26 | 26 | |
| 27 | 27 | let mut cmd = Command::new(collector); |
| 28 | 28 | let cmd = cmd |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -129,7 +129,7 @@ impl Step for ToolBuild { | ||
| 129 | 129 | if tool == "tidy" { |
| 130 | 130 | tool = "rust-tidy"; |
| 131 | 131 | } |
| 132 | -copy_tool_bin(builder, self.compiler, self.target, self.mode, tool) | |
| 132 | +copy_link_tool_bin(builder, self.compiler, self.target, self.mode, tool) | |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | } |
| @@ -214,9 +214,9 @@ pub fn prepare_tool_cargo( | ||
| 214 | 214 | cargo |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | -/// Copies a built tool binary with the given `name` from the build directory to the | |
| 217 | +/// Links a built tool binary with the given `name` from the build directory to the | |
| 218 | 218 | /// tools directory. |
| 219 | -fn copy_tool_bin( | |
| 219 | +fn copy_link_tool_bin( | |
| 220 | 220 | builder: &Builder<'_>, |
| 221 | 221 | compiler: Compiler, |
| 222 | 222 | target: TargetSelection, |
| @@ -413,7 +413,7 @@ impl Step for RustcPerf { | ||
| 413 | 413 | let collector_bin = builder.ensure(tool.clone()); |
| 414 | 414 | // We also need to symlink the `rustc-fake` binary to the corresponding directory, |
| 415 | 415 | // because `collector` expects it in the same directory. |
| 416 | -copy_tool_bin(builder, tool.compiler, tool.target, tool.mode, "rustc-fake"); | |
| 416 | +copy_link_tool_bin(builder, tool.compiler, tool.target, tool.mode, "rustc-fake"); | |
| 417 | 417 | |
| 418 | 418 | collector_bin |
| 419 | 419 | } |