about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorRémy Rakic <remy.rakic+github@gmail.com>2024-06-11 16:30:47 +0000
committerRémy Rakic <remy.rakic+github@gmail.com>2024-06-11 17:38:08 +0000
commitbbc50376b0f44c70e3a17a2db5cd16f3ad4f04f8 (patch)
treeef280d4e9cfe088c215ce85c3b3cf5cce7a368d7 /src/bootstrap
parent0c960618b56f662d933e8b864cd9632a99174e87 (diff)
downloadrust-bbc50376b0f44c70e3a17a2db5cd16f3ad4f04f8.tar.gz
rust-bbc50376b0f44c70e3a17a2db5cd16f3ad4f04f8.zip
ensure the self-contained linker is only enabled on nightly/dev
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/src/core/build_steps/compile.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index 66692a2a2cb..b16f3e5bd81 100644
--- 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");
     }