Skip to content

Commit ddfa768

Browse files
committed
Auto merge of rust-lang#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
2 parents 75ac3b6 + f422f46 commit ddfa768

File tree

2 files changed

+4
-4
lines changed
  • library/alloc/src/collections/binary_heap
  • src/bootstrap/src/core/build_steps

2 files changed

+4
-4
lines changed

library/alloc/src/collections/binary_heap/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,7 @@ impl<T: Ord> BinaryHeap<T> {
440440
/// heap.push(4);
441441
/// ```
442442
#[stable(feature = "rust1", since = "1.0.0")]
443-
#[rustc_const_stable(
444-
feature = "const_binary_heap_constructor",
445-
since = "1.80.0"
446-
)]
443+
#[rustc_const_stable(feature = "const_binary_heap_constructor", since = "1.80.0")]
447444
#[must_use]
448445
pub const fn new() -> BinaryHeap<T> {
449446
BinaryHeap { data: vec![] }

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

+3
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,10 @@ pub fn rustc_cargo_env(
11381138

11391139
// Enable rustc's env var for `rust-lld` when requested.
11401140
if builder.config.lld_enabled {
1141+
eprintln!("status: CFG_USE_SELF_CONTAINED_LINKER is enabled");
11411142
cargo.env("CFG_USE_SELF_CONTAINED_LINKER", "1");
1143+
} else {
1144+
eprintln!("status: CFG_USE_SELF_CONTAINED_LINKER is disabled");
11421145
}
11431146

11441147
if builder.config.rust_verify_llvm_ir {

0 commit comments

Comments
 (0)