From b420815fd65f9c4dbb179ddd7b41c1478a3e6b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Tue, 11 Jun 2024 16:30:47 +0000 Subject: [PATCH 1/2] tmp: show self-contained linker status --- src/bootstrap/src/core/build_steps/compile.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs index 66692a2a2cbbc..8c3d9af3d5c50 100644 --- 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 { From 77c582adde7a97980b5d6622ed891cf6abc0973a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Rakic?= Date: Tue, 11 Jun 2024 16:35:35 +0000 Subject: [PATCH 2/2] fix rustfmt issue in libstd --- library/alloc/src/collections/binary_heap/mod.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/library/alloc/src/collections/binary_heap/mod.rs b/library/alloc/src/collections/binary_heap/mod.rs index 0a0f10704ae1b..af01db19139e3 100644 --- a/library/alloc/src/collections/binary_heap/mod.rs +++ b/library/alloc/src/collections/binary_heap/mod.rs @@ -440,10 +440,7 @@ impl BinaryHeap { /// 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 { BinaryHeap { data: vec![] }