Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl Step for ToolBuild {
_ => panic!("unexpected Mode for tool build")
}

let cargo = prepare_tool_cargo(
let mut cargo = prepare_tool_cargo(
builder,
compiler,
self.mode,
Expand All @@ -74,6 +74,11 @@ impl Step for ToolBuild {
&self.extra_features,
);

// Pass the --bin flags to tell Cargo that is should only build the tool binaries.
// If not, Cargo will build everything by default, including the deprecated clippy plugin
// that causes failure on cross-compiled platforms.
cargo.arg("--bin").arg(&tool);

builder.info(&format!("Building stage{} tool {} ({})", compiler.stage, tool, target));
let mut duplicates = Vec::new();
let is_expected = compile::stream_cargo(builder, cargo, vec![], &mut |msg| {
Expand Down