From caf4d6ca7928e40a203456341346299608eade17 Mon Sep 17 00:00:00 2001
From: Colin Finck <colin@osdyne.com>
Date: Wed, 14 Jan 2026 11:29:32 +0100
Subject: [PATCH] dist: Ship more Windows import libs with the `rust-mingw`
 package of `*-windows-gnullvm` targets.

This fixes building crates like https://crates.io/crates/blake3, which use `cc` and depend on additional Windows import libs.

The list of shipped Windows import libs now matches the `rust-mingw` package of the `x86_64-pc-windows-gnu` target.
---
 src/bootstrap/src/core/build_steps/dist.rs | 30 ++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index f47b0c0b0072d..ec6e96226a808 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -318,12 +318,38 @@ fn make_win_llvm_dist(plat_root: &Path, target: TargetSelection, builder: &Build
         "libmingwex.a",
         "libmsvcrt.a",
         // Windows import libs, remove them once std transitions to raw-dylib
+        "libadvapi32.a",
+        "libbcrypt.a",
+        "libcomctl32.a",
+        "libcomdlg32.a",
+        "libcredui.a",
+        "libcrypt32.a",
+        "libdbghelp.a",
+        "libgdi32.a",
+        "libimagehlp.a",
+        "libiphlpapi.a",
         "libkernel32.a",
-        "libuser32.a",
+        "libmsimg32.a",
+        "libmsvcrt.a",
         "libntdll.a",
+        "libodbc32.a",
+        "libole32.a",
+        "liboleaut32.a",
+        "libopengl32.a",
+        "libpsapi.a",
+        "librpcrt4.a",
+        "libsecur32.a",
+        "libsetupapi.a",
+        "libshell32.a",
+        "libsynchronization.a",
+        "libuser32.a",
         "libuserenv.a",
+        "libuuid.a",
+        "libwinhttp.a",
+        "libwinmm.a",
+        "libwinspool.a",
         "libws2_32.a",
-        "libdbghelp.a",
+        "libwsock32.a",
     ];
 
     //Find mingw artifacts we want to bundle