File tree Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Expand file tree Collapse file tree 2 files changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -1326,9 +1326,7 @@ pub fn rustc_cargo_env(
1326
1326
}
1327
1327
1328
1328
// Enable rustc's env var for `rust-lld` when requested.
1329
- if builder. config . lld_enabled
1330
- && ( builder. config . channel == "dev" || builder. config . channel == "nightly" )
1331
- {
1329
+ if builder. config . lld_enabled {
1332
1330
cargo. env ( "CFG_USE_SELF_CONTAINED_LINKER" , "1" ) ;
1333
1331
}
1334
1332
Original file line number Diff line number Diff line change @@ -2464,7 +2464,6 @@ impl Config {
2464
2464
// build our internal lld and use it as the default linker, by setting the `rust.lld` config
2465
2465
// to true by default:
2466
2466
// - on the `x86_64-unknown-linux-gnu` target
2467
- // - on the `dev` and `nightly` channels
2468
2467
// - when building our in-tree llvm (i.e. the target has not set an `llvm-config`), so that
2469
2468
// we're also able to build the corresponding lld
2470
2469
// - or when using an external llvm that's downloaded from CI, which also contains our prebuilt
@@ -2473,10 +2472,7 @@ impl Config {
2473
2472
// thus, disabled
2474
2473
// - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
2475
2474
// when the config sets `rust.lld = false`
2476
- if config. build . triple == "x86_64-unknown-linux-gnu"
2477
- && config. hosts == [ config. build ]
2478
- && ( config. channel == "dev" || config. channel == "nightly" )
2479
- {
2475
+ if config. build . triple == "x86_64-unknown-linux-gnu" && config. hosts == [ config. build ] {
2480
2476
let no_llvm_config = config
2481
2477
. target_config
2482
2478
. get ( & config. build )
You can’t perform that action at this time.
0 commit comments