no flavors?

Author: dzbarsky

rust/private/rustc.bzl

@@ -1946,7 +1946,7 @@ def _get_crate_dirname(crate):
     """
     return crate.output.dirname
 
-def _portable_link_flags(lib, use_pic, get_lib_name, for_windows = False, for_darwin = False, flavor_msvc = False):
+def _portable_link_flags(lib, use_pic, for_darwin = False):
     artifact = get_preferred_artifact(lib, use_pic)
     if lib.static_library or lib.pic_static_library:
         # To ensure appropriate linker library argument order, in the presence
@@ -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,
@@ -2022,7 +2010,7 @@ def _make_link_flags_windows(make_link_flags_args, flavor_msvc):
                     "-Clink-arg=-Wl,--no-whole-archive",
                 ])
         elif include_link_flags:
-            ret.extend(_portable_link_flags(lib, use_pic, get_lib_name_for_windows, for_windows = True, flavor_msvc = flavor_msvc))
+            ret.extend(_portable_link_flags(lib, use_pic))
     _add_user_link_flags(ret, linker_input)
     return ret
 
@@ -2039,7 +2027,7 @@ def _make_link_flags_darwin(make_link_flags_args):
         if lib.alwayslink:
             ret.append("-Clink-arg=-Wl,-force_load,%s" % get_preferred_artifact(lib, use_pic).path)
         elif include_link_flags:
-            ret.extend(_portable_link_flags(lib, use_pic, get_lib_name_default, for_darwin = True))
+            ret.extend(_portable_link_flags(lib, use_pic, for_darwin = True))
     _add_user_link_flags(ret, linker_input)
     return ret
 
@@ -2054,7 +2042,7 @@ def _make_link_flags_default(make_link_flags_args):
                 "-Clink-arg=-Wl,--no-whole-archive",
             ])
         elif include_link_flags:
-            ret.extend(_portable_link_flags(lib, use_pic, get_lib_name_default))
+            ret.extend(_portable_link_flags(lib, use_pic))
     _add_user_link_flags(ret, linker_input)
     return ret
 

test/unit/ambiguous_libs/ambiguous_libs_test.bzl

@@ -24,9 +24,14 @@ def _ambiguous_deps_test_impl(ctx):
 
     # We depend on two C++ libraries named "native_dep", which we need to pass to the command line
     # 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])
 

test/unit/proc_macro/leaks_deps/proc_macro_does_not_leak_deps.bzl

@@ -3,9 +3,6 @@
 load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
 load("//rust:defs.bzl", "rust_library", "rust_proc_macro", "rust_test")
 
-def _get_toolchain(ctx):
-    return ctx.attr._toolchain[platform_common.ToolchainInfo]
-
 def _proc_macro_does_not_leak_deps_impl(ctx):
     env = analysistest.begin(ctx)
     actions = analysistest.target_under_test(env).actions
@@ -14,7 +11,6 @@ def _proc_macro_does_not_leak_deps_impl(ctx):
         if action.mnemonic == "Rustc":
             rustc_action = action
             break
-    toolchain = _get_toolchain(ctx)
 
     asserts.false(env, rustc_action == None)
 
@@ -29,10 +25,7 @@ def _proc_macro_does_not_leak_deps_impl(ctx):
     # Our test target depends on proc_macro_dep:native directly, as well as transitively through the
     # proc_macro. The proc_macro should not leak its dependency, so we should only get the "native"
     # library once on the command line.
-    if toolchain.target_os == "windows" and toolchain.target_triple.abi == "msvc":
-        native_deps = [arg for arg in rustc_action.argv if arg == "-Clink-arg=native.lib"]
-    else:
-        native_deps = [arg for arg in rustc_action.argv if arg.endswith("test/unit/proc_macro/leaks_deps/native/libnative.a")]
+    native_deps = [arg for arg in rustc_action.argv if arg.endswith("test/unit/proc_macro/leaks_deps/native/libnative.a")]
     asserts.equals(env, 1, len(native_deps))
 
     return analysistest.end(env)
@@ -73,9 +66,7 @@ def _proc_macro_does_not_leak_deps_test():
         target_under_test = ":deps_not_leaked",
     )
 
-proc_macro_does_not_leak_deps_test = analysistest.make(_proc_macro_does_not_leak_deps_impl, attrs = {
-    "_toolchain": attr.label(default = Label("//rust/toolchain:current_rust_toolchain")),
-})
+proc_macro_does_not_leak_deps_test = analysistest.make(_proc_macro_does_not_leak_deps_impl)
 
 # Tests that a lib_a -> proc_macro -> lib_b does not propagate lib_b to the inputs of lib_a
 def _proc_macro_does_not_leak_lib_deps_impl(ctx):