ensure the self-contained linker is only enabled on nightly/dev

lqd · lqd · commit bbc50376b0f4 · 2024-06-11T17:38:08.000Z
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
@@ -1137,7 +1137,9 @@ pub fn rustc_cargo_env(
     }
 
     // Enable rustc's env var for `rust-lld` when requested.
-    if builder.config.lld_enabled {
+    if builder.config.lld_enabled
+        && (builder.config.channel == "dev" || builder.config.channel == "nightly")
+    {
         cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1137,7 +1137,9 @@ pub fn rustc_cargo_env(`
`1137`	`1137`	`}`
`1138`	`1138`
`1139`	`1139`	// 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`	`+ {`
`1141`	`1143`	`cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");`
`1142`	`1144`	`}`
`1143`	`1145`