diff options
| author | bors <bors@rust-lang.org> | 2025-09-06 06:43:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-06 06:43:38 +0000 |
| commit | 0d0f4eac8b98133e5da6d3604d86a8f3b5a67844 (patch) | |
| tree | 9d82fab63d40098cda0d1913ac84a4f8ffbb4fef /src/bootstrap | |
| parent | 397f93362974d298b79e0e0cd43677014aa7b722 (diff) | |
| parent | edb92a33d73852582c76d0ed48d9373c5f709b2e (diff) | |
| download | rust-0d0f4eac8b98133e5da6d3604d86a8f3b5a67844.tar.gz rust-0d0f4eac8b98133e5da6d3604d86a8f3b5a67844.zip | |
Auto merge of #146253 - Kobzol:cargo-lto, r=jieyouxu
Optimize Cargo with LTO This optimization was "lost" when Cargo was switched away from a `ToolRustcPrivate` to a `ToolTarget` tool. r? `@jieyouxu`
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/tool.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs index c5308034fe3..6870bf3eddc 100644 --- a/src/bootstrap/src/core/build_steps/tool.rs +++ b/src/bootstrap/src/core/build_steps/tool.rs @@ -121,9 +121,11 @@ impl Step for ToolBuild { cargo.env("RUSTC_WRAPPER", ccache); } - // Rustc tools (miri, clippy, cargo, rustfmt, rust-analyzer) + // RustcPrivate tools (miri, clippy, rustfmt, rust-analyzer) and cargo // could use the additional optimizations. - if self.mode == Mode::ToolRustcPrivate && is_lto_stage(&self.build_compiler) { + if is_lto_stage(&self.build_compiler) + && (self.mode == Mode::ToolRustcPrivate || self.path == "src/tools/cargo") + { let lto = match builder.config.rust_lto { RustcLto::Off => Some("off"), RustcLto::Thin => Some("thin"), |