Skip to content

Commit a819e10

Browse files
Kobzollqd
authored andcommitted
Use LLD by default on x64 regardless of channel
1 parent a4166da commit a819e10

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

src/bootstrap/src/core/build_steps/compile.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,9 +1331,7 @@ pub fn rustc_cargo_env(
13311331
}
13321332

13331333
// Enable rustc's env var for `rust-lld` when requested.
1334-
if builder.config.lld_enabled
1335-
&& (builder.config.channel == "dev" || builder.config.channel == "nightly")
1336-
{
1334+
if builder.config.lld_enabled {
13371335
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
13381336
}
13391337

src/bootstrap/src/core/config/config.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,10 +2365,7 @@ impl Config {
23652365
// thus, disabled
23662366
// - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
23672367
// when the config sets `rust.lld = false`
2368-
if config.build.triple == "x86_64-unknown-linux-gnu"
2369-
&& config.hosts == [config.build]
2370-
&& (config.channel == "dev" || config.channel == "nightly")
2371-
{
2368+
if config.build.triple == "x86_64-unknown-linux-gnu" && config.hosts == [config.build] {
23722369
let no_llvm_config = config
23732370
.target_config
23742371
.get(&config.build)

0 commit comments

Comments
 (0)