Rollup merge of rust-lang#148709 - karolzwolak:bootstrap-override-lld-should-disable-self-contained-lld, r=Mark-Simulacrum

matthiaskrgr · web-flow · commit 7df5f5ca298b · 2025-11-09T17:37:06.000+01:00
fix: disable self-contained linker when bootstrap-override-lld is set Part of rust-lang#148708. Makes `rust.bootstrap-override-lld` set to `true` or `"external"` disable self-contained linker — actually using linker from one's system.
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
@@ -430,6 +430,7 @@ pub fn linker_flags(
         match builder.config.bootstrap_override_lld {
             BootstrapOverrideLld::External => {
                 args.push("-Clinker-features=+lld".to_string());
+                args.push("-Clink-self-contained=-linker".to_string());
                 args.push("-Zunstable-options".to_string());
             }
             BootstrapOverrideLld::SelfContained => {

Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,7 @@ pub fn linker_flags(`
`430`	`430`	`match builder.config.bootstrap_override_lld {`
`431`	`431`	`BootstrapOverrideLld::External => {`
`432`	`432`	`args.push("-Clinker-features=+lld".to_string());`
	`433`	`+ args.push("-Clink-self-contained=-linker".to_string());`
`433`	`434`	`args.push("-Zunstable-options".to_string());`
`434`	`435`	`}`
`435`	`436`	`BootstrapOverrideLld::SelfContained => {`