Skip to content

Commit 49b28a4

Browse files
Rollup merge of #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 #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 3065010 + bbc5037 commit 49b28a4

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
@@ -1137,7 +1137,9 @@ pub fn rustc_cargo_env(
11371137
}
11381138

11391139
// Enable rustc's env var for `rust-lld` when requested.
1140-
if builder.config.lld_enabled {
1140+
if builder.config.lld_enabled
1141+
&& (builder.config.channel == "dev" || builder.config.channel == "nightly")
1142+
{
11411143
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
11421144
}
11431145

0 commit comments

Comments
 (0)