Rollup merge of rust-lang#138233 - smmalis37:no-advapi32, r=ChrisDenton

matthiaskrgr · web-flow · commit 2cbf2700ff10 · 2025-03-09T16:41:52.000+01:00
Windows: Don't link std (and run-make) against advapi32, except on win7

Std no longer depends on any functionality provided by advapi32, so we can remove it from the list of external libraries we link against. Except, the win7 targets do still rely on advapi32-provided functionality. This PR therefore moves linking against it to only occur on win7 targets, so that no new uses of it slip in without being noticed.
diff --git a/windows_targets/src/lib.rs b/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")]

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ pub macro link {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#[cfg(not(feature = "windows_raw_dylib"))]`
`37`		`-#[link(name = "advapi32")]`
	`37`	`+#[cfg_attr(target_vendor = "win7", link(name = "advapi32"))]`
`38`	`38`	`#[link(name = "ntdll")]`
`39`	`39`	`#[link(name = "userenv")]`
`40`	`40`	`#[link(name = "ws2_32")]`