diff --git a/patches/rules_rust_windows_bootstrap_process_wrapper_linker.patch b/patches/rules_rust_windows_bootstrap_process_wrapper_linker.patch index b42912b586..d41c59d3fb 100644 --- a/patches/rules_rust_windows_bootstrap_process_wrapper_linker.patch +++ b/patches/rules_rust_windows_bootstrap_process_wrapper_linker.patch @@ -1,9 +1,9 @@ --- a/rust/private/rustc.bzl +++ b/rust/private/rustc.bzl @@ -472,7 +472,19 @@ - ) - ld_is_direct_driver = False - + ) + ld_is_direct_driver = False + - if not ld or toolchain.linker_preference == "rust": + # The bootstrap process wrapper is built without the normal rules_rust + # process wrapper. On Windows nightly toolchains that expose rust-lld, the @@ -18,5 +18,6 @@ + ) + + if not ld or toolchain.linker_preference == "rust" or use_bootstrap_rust_linker: - ld = toolchain.linker.path - ld_is_direct_driver = toolchain.linker_type == "direct" + ld = toolchain.linker.path + ld_is_direct_driver = toolchain.linker_type == "direct" +