Auto merge of #126278 - lqd:beta, r=<try>

[beta] Check self-contained linker status It seems the self-contained linker is enabled on beta. Let's fix that. r? ghost
rust-lang · Jun 11, 2024 · dbf33b0 · dbf33b0
2 parents 75ac3b6 + 77c582a
commit dbf33b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/library/alloc/src/collections/binary_heap/mod.rs b/library/alloc/src/collections/binary_heap/mod.rs
@@ -440,10 +440,7 @@ impl<T: Ord> BinaryHeap<T> {
     /// heap.push(4);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
-    #[rustc_const_stable(
-        feature = "const_binary_heap_constructor",
-        since = "1.80.0"
-    )]
+    #[rustc_const_stable(feature = "const_binary_heap_constructor", since = "1.80.0")]
     #[must_use]
     pub const fn new() -> BinaryHeap<T> {
         BinaryHeap { data: vec![] }

diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
@@ -1137,8 +1137,13 @@ 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")
+    {
+        eprintln!("status: CFG_USE_SELF_CONTAINED_LINKER is enabled");
         cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
+    } else {
+        eprintln!("status: CFG_USE_SELF_CONTAINED_LINKER is disabled");
     }
 
     if builder.config.rust_verify_llvm_ir {