mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
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
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
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 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
|
||||
&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,
|
||||
|
||||
Reference in New Issue
Block a user