Skip to content

Commit 65fcba6

Browse files
authored
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
2 parents 13314df + c76e59e commit 65fcba6

File tree

1 file changed

+1
-3
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-3
lines changed

src/bootstrap/src/core/build_steps/tool.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::core::builder;
99
use crate::core::builder::{Builder, Cargo as CargoCommand, RunConfig, ShouldRun, Step};
1010
use crate::core::config::TargetSelection;
1111
use crate::utils::channel::GitInfo;
12-
use crate::utils::exec::BootstrapCommand;
1312
use crate::utils::helpers::output;
1413
use crate::utils::helpers::{add_dylib_path, exe, t};
1514
use crate::Compiler;
@@ -110,9 +109,8 @@ impl Step for ToolBuild {
110109
&self.target,
111110
);
112111

113-
let mut cargo = Command::from(cargo);
114112
// we check this below
115-
let build_success = builder.run_cmd(BootstrapCommand::from(&mut cargo).allow_failure());
113+
let build_success = compile::stream_cargo(builder, cargo, vec![], &mut |_| {});
116114

117115
builder.save_toolstate(
118116
tool,

0 commit comments

Comments
 (0)