user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use LLD by default on x64 regardless of channel

Browse source
This commit is contained in:
Rémy Rakic 2025-03-17 21:57:44 +01:00
parent 2783fc43fd
commit a4ea949356
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/src/core/build_steps/compile.rs
View file

@ -1369,9 +1369,7 @@ pub fn rustc_cargo_env(
}
// Enable rustc's env var for `rust-lld` when requested.
if builder.config.lld_enabled
&& (builder.config.channel == "dev" || builder.config.channel == "nightly")
{
if builder.config.lld_enabled {
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
}

5
src/bootstrap/src/core/config/toml/rust.rs
View file

@ -619,7 +619,6 @@ impl Config {
// build our internal lld and use it as the default linker, by setting the `rust.lld` config
// to true by default:
// - on the `x86_64-unknown-linux-gnu` target
// - on the `dev` and `nightly` channels
// - when building our in-tree llvm (i.e. the target has not set an `llvm-config`), so that
// we're also able to build the corresponding lld
// - or when using an external llvm that's downloaded from CI, which also contains our prebuilt
@ -628,9 +627,7 @@ impl Config {
// thus, disabled
// - similarly, lld will not be built nor used by default when explicitly asked not to, e.g.
// when the config sets `rust.lld = false`
if self.host_target.triple == "x86_64-unknown-linux-gnu"
&& self.hosts == [self.host_target]
&& (self.channel == "dev" || self.channel == "nightly")
if self.host_target.triple == "x86_64-unknown-linux-gnu" && self.hosts == [self.host_target]
{
let no_llvm_config = self
.target_config