Skip to content

Commit 4b6f122

Browse files
authored
Unrolled build for #148709
Rollup merge of #148709 - karolzwolak:bootstrap-override-lld-should-disable-self-contained-lld, r=Mark-Simulacrum fix: disable self-contained linker when bootstrap-override-lld is set Part of #148708. Makes `rust.bootstrap-override-lld` set to `true` or `"external"` disable self-contained linker — actually using linker from one's system.
2 parents ab67c37 + 7eb5492 commit 4b6f122

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

src/bootstrap/src/utils/helpers.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ pub fn linker_flags(
430430
match builder.config.bootstrap_override_lld {
431431
BootstrapOverrideLld::External => {
432432
args.push("-Clinker-features=+lld".to_string());
433+
args.push("-Clink-self-contained=-linker".to_string());
433434
args.push("-Zunstable-options".to_string());
434435
}
435436
BootstrapOverrideLld::SelfContained => {

0 commit comments

Comments
 (0)