diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl index 11d97aaa3..ef6ebd61d 100644 --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl @@ -501,11 +501,25 @@ def get_linker_and_args(ctx, crate_type, toolchain, cc_toolchain, feature_config filtered_args.append(version) # Keep library search path flags + elif processed_arg == "-L" and i + 1 < len(link_args): + path = link_args[i + 1] + if ld_is_direct_driver and toolchain.target_os == "windows": + skip_next = True + continue + filtered_args.extend([processed_arg, path]) + skip_next = True + elif processed_arg.startswith("-L"): + if ld_is_direct_driver and toolchain.target_os == "windows": + continue filtered_args.append(processed_arg) # Keep sysroot flags (as single or two-part arguments) elif processed_arg == "--sysroot" or processed_arg.startswith("--sysroot="): + if ld_is_direct_driver and toolchain.target_os == "windows": + if processed_arg == "--sysroot" and i + 1 < len(link_args): + skip_next = True + continue filtered_args.append(processed_arg) if processed_arg == "--sysroot" and i + 1 < len(link_args): # Two-part argument, keep the next arg too @@ -2265,8 +2279,10 @@ def portable_link_flags( use_pic, ambiguous_libs, get_lib_name, + for_windows = False, for_darwin = False, - flavor_msvc = False): + flavor_msvc = False, + use_direct_driver = False): """_summary_ Args: @@ -2319,6 +2335,11 @@ def portable_link_flags( ): return [] if for_darwin else ["-lstatic=%s" % get_lib_name(artifact)] + if for_windows and use_direct_driver and not artifact.basename.endswith(".lib"): + return [ + "-Clink-arg={}".format(artifact.path), + ] + if flavor_msvc: return [ "-lstatic=%s" % get_lib_name(artifact), @@ -2355,7 +2376,15 @@ def _make_link_flags_windows(make_link_flags_args, flavor_msvc, use_direct_drive ]) elif include_link_flags: get_lib_name = get_lib_name_for_windows if flavor_msvc else get_lib_name_default - ret.extend(portable_link_flags(lib, use_pic, ambiguous_libs, get_lib_name, flavor_msvc = flavor_msvc)) + ret.extend(portable_link_flags( + lib, + use_pic, + ambiguous_libs, + get_lib_name, + for_windows = True, + flavor_msvc = flavor_msvc, + use_direct_driver = use_direct_driver, + )) # Windows toolchains can inherit POSIX defaults like -pthread from C deps, # which fails to link with the MinGW/LLD toolchain. Drop them here. @@ -2531,14 +2560,21 @@ def _add_native_link_flags( else: # For all other crate types we want to link C++ runtime library statically # (for example libstdc++.a or libc++.a). + runtime_libs = cc_toolchain.static_runtime_lib(feature_configuration = feature_configuration) + if toolchain.target_os == "windows" and use_direct_link_driver: + runtime_libs = depset([ + runtime_lib + for runtime_lib in runtime_libs.to_list() + if runtime_lib.basename.endswith(".lib") + ]) args.add_all( - cc_toolchain.static_runtime_lib(feature_configuration = feature_configuration), + runtime_libs, map_each = _get_dirname, format_each = "-Lnative=%s", ) if include_link_flags: args.add_all( - cc_toolchain.static_runtime_lib(feature_configuration = feature_configuration), + runtime_libs, map_each = get_lib_name, format_each = "-lstatic=%s", )