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(
13261326 }
13271327
13281328 // 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 {
13321330 cargo. env ( "CFG_USE_SELF_CONTAINED_LINKER" , "1" ) ;
13331331 }
13341332
Original file line number Diff line number Diff line change @@ -2469,7 +2469,6 @@ impl Config {
24692469 // build our internal lld and use it as the default linker, by setting the `rust.lld` config
24702470 // to true by default:
24712471 // - on the `x86_64-unknown-linux-gnu` target
2472- // - on the `dev` and `nightly` channels
24732472 // - when building our in-tree llvm (i.e. the target has not set an `llvm-config`), so that
24742473 // we're also able to build the corresponding lld
24752474 // - or when using an external llvm that's downloaded from CI, which also contains our prebuilt
@@ -2478,10 +2477,7 @@ impl Config {
24782477 // thus, disabled
24792478 // - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
24802479 // when the config sets `rust.lld = false`
2481- if config. build . triple == "x86_64-unknown-linux-gnu"
2482- && config. hosts == [ config. build ]
2483- && ( config. channel == "dev" || config. channel == "nightly" )
2484- {
2480+ if config. build . triple == "x86_64-unknown-linux-gnu" && config. hosts == [ config. build ] {
24852481 let no_llvm_config = config
24862482 . target_config
24872483 . get ( & config. build )
You can’t perform that action at this time.
0 commit comments