Skip to content

Commit 99cea41

Browse files
committed
Use LLD by default on x64 regardless of channel
1 parent 8279176 commit 99cea41

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
@@ -1328,9 +1328,7 @@ pub fn rustc_cargo_env(
13281328
}
13291329

13301330
// Enable rustc's env var for `rust-lld` when requested.
1331-
if builder.config.lld_enabled
1332-
&& (builder.config.channel == "dev" || builder.config.channel == "nightly")
1333-
{
1331+
if builder.config.lld_enabled {
13341332
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
13351333
}
13361334

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,10 +2334,7 @@ impl Config {
23342334
// thus, disabled
23352335
// - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
23362336
// when the config sets `rust.lld = false`
2337-
if config.build.triple == "x86_64-unknown-linux-gnu"
2338-
&& config.hosts == [config.build]
2339-
&& (config.channel == "dev" || config.channel == "nightly")
2340-
{
2337+
if config.build.triple == "x86_64-unknown-linux-gnu" && config.hosts == [config.build] {
23412338
let no_llvm_config = config
23422339
.target_config
23432340
.get(&config.build)

0 commit comments

Comments
 (0)