Skip adding unicows-wrapped libraries in order to properly support adding unicows.lib before them

Author: seritools

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -2388,6 +2388,11 @@ fn collect_natvis_visualizers(
     visualizer_paths
 }
 
+const UNICOWS_LIBS: &[&str] = &[
+    "kernel32", "advapi32", "user32", "gdi32", "shell32", "comdlg32", "version", "mpr", "rasapi32",
+    "winmm", "winspool", "vfw32", "secur32", "oleacc", "oledlg", "sensapi",
+];
+
 fn add_native_libs_from_crate(
     cmd: &mut dyn Linker,
     sess: &Session,
@@ -2400,6 +2405,8 @@ fn add_native_libs_from_crate(
     link_static: bool,
     link_dynamic: bool,
 ) {
+    let is_target_oldpc = sess.target.vendor == "rust9x";
+
     if !sess.opts.unstable_opts.link_native_libraries {
         // If `-Zlink-native-libraries=false` is set, then the assumption is that an
         // external build system already has the native dependencies defined, and it
@@ -2434,7 +2441,15 @@ fn add_native_libs_from_crate(
         };
 
         let name = lib.name.as_str();
+
+        if is_target_oldpc && UNICOWS_LIBS.contains(&name.as_str()) {
+            // skip adding unicows-wrapped libraries in order to properly support adding
+            // `unicows.lib` before them
+            continue;
+        }
+
         let verbatim = lib.verbatim;
+
         match lib.kind {
             NativeLibKind::Static { bundle, whole_archive } => {
                 if link_static {