no flavors?

Author: dzbarsky

rust/private/rustc.bzl

@@ -1984,20 +1984,8 @@ def _portable_link_flags(lib, use_pic, get_lib_name, for_windows = False, for_da
         ):
             return [] if for_darwin else ["-Clink-arg=%s" % artifact.path]
 
-        if for_windows:
-            if flavor_msvc:
-                return [
-                    "-lstatic=%s" % get_lib_name(artifact),
-                    "-Clink-arg={}".format(artifact.basename),
-                ]
-            else:
-                return [
-                    "-Clink-arg=%s" % artifact.path,
-                ]
-        else:
-            return [
-                "-Clink-arg=%s" % artifact.path,
-            ]
+        return ["-Clink-arg=%s" % artifact.path]
+
     elif _is_dylib(lib):
         return [
             "-Clink-arg=%s" % artifact.path,

test/unit/ambiguous_libs/ambiguous_libs_test.bzl

@@ -26,7 +26,15 @@ def _ambiguous_deps_test_impl(ctx):
     # in the form of "-Clink-arg=${pwd}/bazel-out/darwin_arm64-fastbuild/bin/test/unit/ambiguous_libs/first_dep/libnative_dep.a"
     for arg in rustc_action.argv:
         print("_ambiguous_deps_test_impl", arg)
-    link_args = [arg for arg in rustc_action.argv if arg.endswith("libnative_dep{}.a".format(pic_suffix))]
+    
+    if ctx.target_platform_has_constraint(
+        ctx.attr._windows_constraint[platform_common.ConstraintValueInfo],
+    ):
+        lib_name = "native_dep{}.lib".format(pic_suffix)
+    else:
+        lib_name = "libnative_dep{}.a".format(pic_suffix)
+    
+    link_args = [arg for arg in rustc_action.argv if arg.endswith(lib_name)]
     asserts.equals(env, 2, len(link_args))
     asserts.false(env, link_args[0] == link_args[1])