From 13f3bd1f7a4191e1adae4bef5ee9a715f0a1c7bf Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Mon, 24 Feb 2025 13:48:29 +0000 Subject: [PATCH 1/2] add `tool::CargoClippy` binary to target sysroot Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/tool.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 39acb646dff4d..42424b885958c 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -1187,12 +1187,17 @@ fn run_tool_build_step( } tool_extended!(Cargofmt { path: "src/tools/rustfmt", tool_name: "cargo-fmt", stable: true }); -tool_extended!(CargoClippy { path: "src/tools/clippy", tool_name: "cargo-clippy", stable: true }); +tool_extended!(CargoClippy { + path: "src/tools/clippy", + tool_name: "cargo-clippy", + stable: true, + add_bins_to_sysroot: ["cargo-clippy"] +}); tool_extended!(Clippy { path: "src/tools/clippy", tool_name: "clippy-driver", stable: true, - add_bins_to_sysroot: ["clippy-driver", "cargo-clippy"] + add_bins_to_sysroot: ["clippy-driver"] }); tool_extended!(Miri { path: "src/tools/miri", From f677bab5dae958a6853f9298697780975199a64c Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Mon, 24 Feb 2025 14:13:12 +0000 Subject: [PATCH 2/2] add `tool::Cargofmt` binary to target sysroot Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/tool.rs | 9 +++++++-- src/bootstrap/src/core/builder/mod.rs | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index 42424b885958c..ee6b5d2a5de55 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -1186,7 +1186,12 @@ fn run_tool_build_step( } } -tool_extended!(Cargofmt { path: "src/tools/rustfmt", tool_name: "cargo-fmt", stable: true }); +tool_extended!(Cargofmt { + path: "src/tools/rustfmt", + tool_name: "cargo-fmt", + stable: true, + add_bins_to_sysroot: ["cargo-fmt"] +}); tool_extended!(CargoClippy { path: "src/tools/clippy", tool_name: "cargo-clippy", @@ -1216,7 +1221,7 @@ tool_extended!(Rustfmt { path: "src/tools/rustfmt", tool_name: "rustfmt", stable: true, - add_bins_to_sysroot: ["rustfmt", "cargo-fmt"] + add_bins_to_sysroot: ["rustfmt"] }); #[derive(Debug, Clone, PartialEq, Eq, Hash)] diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs index 9c04f097bee27..52b9caa48dc6e 100644 --- a/src/bootstrap/src/core/builder/mod.rs +++ b/src/bootstrap/src/core/builder/mod.rs @@ -890,6 +890,7 @@ impl<'a> Builder<'a> { gcc::Gcc, llvm::Sanitizers, tool::Rustfmt, + tool::Cargofmt, tool::Miri, tool::CargoMiri, llvm::Lld,