From 9278a3ebd6117b29e5c982bc5bb80d31dd353a1a Mon Sep 17 00:00:00 2001
From: Steven Malis <smmalis37@gmail.com>
Date: Sat, 8 Mar 2025 10:55:47 -0500
Subject: [PATCH] Don't link against advapi32, except on win7.
---
library/windows_targets/src/lib.rs | 2 +-
src/bootstrap/src/core/build_steps/dist.rs | 1 -
.../src/external_deps/c_cxx_compiler/extras.rs | 16 +++++++---------
src/tools/run-make-support/src/lib.rs | 2 +-
src/tools/run-make-support/src/targets.rs | 6 ++++++
5 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/library/windows_targets/src/lib.rs b/library/windows_targets/src/lib.rs
index e89bde8b1ab..939fab7d5fe 100644
--- a/library/windows_targets/src/lib.rs
+++ b/library/windows_targets/src/lib.rs
@@ -34,7 +34,7 @@ pub macro link {
}
#[cfg(not(feature = "windows_raw_dylib"))]
-#[link(name = "advapi32")]
+#[cfg_attr(target_vendor = "win7", link(name = "advapi32"))]
#[link(name = "ntdll")]
#[link(name = "userenv")]
#[link(name = "ws2_32")]
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 0296346009f..63deaf7f535 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -232,7 +232,6 @@ fn make_win_dist(
"libpthread.a",
//Windows import libs
//This should contain only the set of libraries necessary to link the standard library.
- "libadvapi32.a",
"libbcrypt.a",
"libcomctl32.a",
"libcomdlg32.a",
diff --git a/src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs b/src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs
index ca6ab3275c4..c0317633873 100644
--- a/src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs
+++ b/src/tools/run-make-support/src/external_deps/c_cxx_compiler/extras.rs
@@ -1,17 +1,15 @@
-use crate::{is_msvc, is_windows, uname};
+use crate::{is_msvc, is_win7, is_windows, uname};
/// `EXTRACFLAGS`
pub fn extra_c_flags() -> Vec<&'static str> {
if is_windows() {
if is_msvc() {
- vec![
- "ws2_32.lib",
- "userenv.lib",
- "advapi32.lib",
- "bcrypt.lib",
- "ntdll.lib",
- "synchronization.lib",
- ]
+ let mut libs =
+ vec!["ws2_32.lib", "userenv.lib", "bcrypt.lib", "ntdll.lib", "synchronization.lib"];
+ if is_win7() {
+ libs.push("advapi32.lib");
+ }
+ libs
} else {
vec!["-lws2_32", "-luserenv", "-lbcrypt", "-lntdll", "-lsynchronization"]
}
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
index c846a2d53e5..e0ad3ee9bed 100644
--- a/src/tools/run-make-support/src/lib.rs
+++ b/src/tools/run-make-support/src/lib.rs
@@ -84,7 +84,7 @@ pub use run::{cmd, run, run_fail, run_with_args};
/// Helpers for checking target information.
pub use targets::{
- apple_os, is_aix, is_darwin, is_msvc, is_windows, is_windows_gnu, llvm_components_contain,
+ apple_os, is_aix, is_darwin, is_msvc, is_windows, is_windows_gnu, is_win7, llvm_components_contain,
target, uname,
};
diff --git a/src/tools/run-make-support/src/targets.rs b/src/tools/run-make-support/src/targets.rs
index a16fca71d2e..86edbdf750b 100644
--- a/src/tools/run-make-support/src/targets.rs
+++ b/src/tools/run-make-support/src/targets.rs
@@ -28,6 +28,12 @@ pub fn is_windows_gnu() -> bool {
target().ends_with("windows-gnu")
}
+/// Check if target is win7.
+#[must_use]
+pub fn is_win7() -> bool {
+ target().contains("win7")
+}
+
/// Check if target uses macOS.
#[must_use]
pub fn is_darwin() -> bool {