diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-06-07 20:14:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 20:14:29 +0200 |
| commit | 65fcba61e4e3ebcbd849744c343ca3e792be6595 (patch) | |
| tree | 06c52ead477fab1b3d96d0aa609762c01e40b080 /src/bootstrap | |
| parent | 13314df21b0bb0cdd02c6760581d1b9f1052fa7e (diff) | |
| parent | c76e59e71295677317389783ecb7b4ebb27f8535 (diff) | |
| download | rust-65fcba61e4e3ebcbd849744c343ca3e792be6595.tar.gz rust-65fcba61e4e3ebcbd849744c343ca3e792be6595.zip | |
Rollup merge of #125781 - onur-ozkan:improve-tool-builder, r=albertlarsan68
prefer `compile::stream_cargo` for building tools Previously, we were running bare commands for `ToolBuild` step and were unable to utilize some of the flags which are already handled by `compile::stream_cargo`. This change makes `ToolBuild` to use `compile::stream_cargo`, allowing us to benefit from the flags supported by the bootstrap cargo. Resolves #125666
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 1b55fc85da4..9df4698f21f 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -9,7 +9,6 @@ use crate::core::builder; use crate::core::builder::{Builder, Cargo as CargoCommand, RunConfig, ShouldRun, Step}; use crate::core::config::TargetSelection; use crate::utils::channel::GitInfo; -use crate::utils::exec::BootstrapCommand; use crate::utils::helpers::output; use crate::utils::helpers::{add_dylib_path, exe, t}; use crate::Compiler; @@ -110,9 +109,8 @@ impl Step for ToolBuild { &self.target, ); - let mut cargo = Command::from(cargo); // we check this below - let build_success = builder.run_cmd(BootstrapCommand::from(&mut cargo).allow_failure()); + let build_success = compile::stream_cargo(builder, cargo, vec![], &mut |_| {}); builder.save_toolstate( tool, |
