Skip to content

Commit 0b78647

Browse files
authored
Unrolled build for rust-lang#126282
Rollup merge of rust-lang#126282 - lqd:contain-the-self-contained-linker, r=Mark-Simulacrum Ensure self-contained linker is only enabled on dev/nightly This is a version of rust-lang#126278 for the master branch. It should be no-op _here_, compared to beta. I'll r? `@Mark-Simulacrum` like the other one.
2 parents c25ac9d + bbc5037 commit 0b78647

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,9 @@ pub fn rustc_cargo_env(
11341134
}
11351135

11361136
// Enable rustc's env var for `rust-lld` when requested.
1137-
if builder.config.lld_enabled {
1137+
if builder.config.lld_enabled
1138+
&& (builder.config.channel == "dev" || builder.config.channel == "nightly")
1139+
{
11381140
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
11391141
}
11401142

0 commit comments

Comments
 (0)