Skip to content

Commit e38de11

Browse files
committed
make bootstrap disable lld on stable
1 parent 1a64320 commit e38de11

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS
13601360
}
13611361

13621362
// Enable rustc's env var for `rust-lld` when requested.
1363-
if builder.config.lld_enabled {
1363+
if builder.config.lld_enabled && builder.config.channel != "stable" {
13641364
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
13651365
}
13661366

src/bootstrap/src/core/config/toml/rust.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,7 @@ impl Config {
657657
// when the config sets `rust.lld = false`
658658
if default_lld_opt_in_targets().contains(&self.host_target.triple.to_string())
659659
&& self.hosts == [self.host_target]
660+
&& self.channel != "stable"
660661
{
661662
let no_llvm_config = self
662663
.target_config

0 commit comments

Comments
 (0)