File tree Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -1357,9 +1357,7 @@ pub fn rustc_cargo_env(
1357
1357
}
1358
1358
1359
1359
// Enable rustc's env var for `rust-lld` when requested.
1360
- if builder. config . lld_enabled
1361
- && ( builder. config . channel == "dev" || builder. config . channel == "nightly" )
1362
- {
1360
+ if builder. config . lld_enabled {
1363
1361
cargo. env ( "CFG_USE_SELF_CONTAINED_LINKER" , "1" ) ;
1364
1362
}
1365
1363
Original file line number Diff line number Diff line change @@ -612,7 +612,6 @@ impl Config {
612
612
// build our internal lld and use it as the default linker, by setting the `rust.lld` config
613
613
// to true by default:
614
614
// - on the `x86_64-unknown-linux-gnu` target
615
- // - on the `dev` and `nightly` channels
616
615
// - when building our in-tree llvm (i.e. the target has not set an `llvm-config`), so that
617
616
// we're also able to build the corresponding lld
618
617
// - or when using an external llvm that's downloaded from CI, which also contains our prebuilt
@@ -621,9 +620,7 @@ impl Config {
621
620
// thus, disabled
622
621
// - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
623
622
// when the config sets `rust.lld = false`
624
- if self . host_target . triple == "x86_64-unknown-linux-gnu"
625
- && self . hosts == [ self . host_target ]
626
- && ( self . channel == "dev" || self . channel == "nightly" )
623
+ if self . host_target . triple == "x86_64-unknown-linux-gnu" && self . hosts == [ self . host_target ]
627
624
{
628
625
let no_llvm_config = self
629
626
. target_config
You can’t perform that action at this time.
0 commit comments