Skip to content

Commit 1ee7051

Browse files
committed
handle bootstrap cfgs
1 parent 2108631 commit 1ee7051

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

src/bootstrap/src/utils/helpers.rs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -421,29 +421,18 @@ pub fn linker_flags(
421421
builder: &Builder<'_>,
422422
target: TargetSelection,
423423
lld_threads: LldThreads,
424-
stage: u32,
424+
_stage: u32,
425425
) -> Vec<String> {
426426
let mut args = vec![];
427427
if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() {
428428
match builder.config.lld_mode {
429429
LldMode::External => {
430-
// cfg(bootstrap) - remove the stage 0 check after updating the bootstrap compiler:
431-
// `-Clinker-features` has been stabilized.
432-
if stage == 0 {
433-
args.push("-Zlinker-features=+lld".to_string());
434-
} else {
435-
args.push("-Clinker-features=+lld".to_string());
436-
}
430+
args.push("-Zlinker-features=+lld".to_string());
431+
args.push("-Clinker-features=+lld".to_string());
437432
args.push("-Zunstable-options".to_string());
438433
}
439434
LldMode::SelfContained => {
440-
// cfg(bootstrap) - remove the stage 0 check after updating the bootstrap compiler:
441-
// `-Clinker-features` has been stabilized.
442-
if stage == 0 {
443-
args.push("-Zlinker-features=+lld".to_string());
444-
} else {
445-
args.push("-Clinker-features=+lld".to_string());
446-
}
435+
args.push("-Clinker-features=+lld".to_string());
447436
args.push("-Clink-self-contained=+linker".to_string());
448437
args.push("-Zunstable-options".to_string());
449438
}

0 commit comments

Comments
 (0)