Skip to content

Expose native Windows build tools through Bazel targets #43126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copyberry merged 1 commit into from
Sep 6, 2026
+169 −2
Merged

Expose native Windows build tools through Bazel targets #43126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ single_version_override(
patch_strip = 1,
patches = [
"//patches:windows-support-remote-case-aliases.patch",
"//patches:windows-support-native-tools.patch",
],
version = "0.2.0",
)
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions patches/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ exports_files([
"webrtc-sys_hermetic_darwin_sysroot.patch",
"windows-link.patch",
"windows-support-remote-case-aliases.patch",
"windows-support-native-tools.patch",
"xz_windows_stack_args.patch",
"zstd-sys_windows_msvc_include_dirs.patch",
])
165 changes: 165 additions & 0 deletions patches/windows-support-native-tools.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
diff --git a/windows/private/extensions/msvc_runtime.bzl b/windows/private/extensions/msvc_runtime.bzl
--- a/windows/private/extensions/msvc_runtime.bzl
+++ b/windows/private/extensions/msvc_runtime.bzl
@@ -204,13 +204,19 @@
_keep_only_children(
repository_ctx,
repository_ctx.path("{}/Contents/VC/Tools/MSVC/{}".format(sysroot_dir, msvc_version)),
- ["include", "lib"],
+ ["include", "lib", "bin"],
)
_keep_only_children(
repository_ctx,
repository_ctx.path("{}/Contents/VC/Tools/MSVC/{}/lib".format(sysroot_dir, msvc_version)),
architectures,
)
+
+ # Keep native-host tools and their support files separate from runtime inputs.
+ bin_dir = "{}/Contents/VC/Tools/MSVC/{}/bin".format(sysroot_dir, msvc_version)
+ _keep_only_children(repository_ctx, repository_ctx.path(bin_dir), ["Host" + arch for arch in architectures])
+ for arch in architectures:
+ _keep_only_children(repository_ctx, repository_ctx.path(bin_dir + "/Host" + arch), [arch])

def _msvc_runtime_repository_impl(repository_ctx):
_check_msvc_license_requirements(repository_ctx)
diff --git a/windows/private/extensions/msvc_runtime.BUILD.bazel b/windows/private/extensions/msvc_runtime.BUILD.bazel
--- a/windows/private/extensions/msvc_runtime.BUILD.bazel
+++ b/windows/private/extensions/msvc_runtime.BUILD.bazel
@@ -17,6 +17,7 @@
name = "sysroot_files",
srcs = glob(
["__MSVC_RUNTIME_DIR__/**"],
+ exclude = ["__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/**"],
allow_empty = True,
),
)
@@ -98,6 +99,7 @@
"**/*.hh",
"**/*.hpp",
],
+ exclude = ["__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/**"],
allow_empty = True,
),
)
@@ -106,6 +108,37 @@
name = "libs",
srcs = glob(
["**/*.lib"],
+ exclude = ["__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/**"],
allow_empty = True,
),
)
+
+# Native build tools are opt-in; ordinary sysroot users keep only headers/libs.
+
+directory(
+ name = "msvc_tools_x64_files",
+ srcs = glob(
+ ["__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/Hostx64/x64/**"],
+ allow_empty = True,
+ ),
+)
+
+subdirectory(
+ name = "msvc_tools_x64",
+ parent = ":msvc_tools_x64_files",
+ path = "__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/Hostx64/x64",
+)
+
+directory(
+ name = "msvc_tools_arm64_files",
+ srcs = glob(
+ ["__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/Hostarm64/arm64/**"],
+ allow_empty = True,
+ ),
+)
+
+subdirectory(
+ name = "msvc_tools_arm64",
+ parent = ":msvc_tools_arm64_files",
+ path = "__MSVC_RUNTIME_DIR__/Contents/VC/Tools/MSVC/__MSVC_VERSION__/bin/Hostarm64/arm64",
+)
diff --git a/windows/private/extensions/windows_sdk.bzl b/windows/private/extensions/windows_sdk.bzl
--- a/windows/private/extensions/windows_sdk.bzl
+++ b/windows/private/extensions/windows_sdk.bzl
@@ -31,13 +31,18 @@
def _keep_exposed_windows_sdk_files(repository_ctx, sysroot_dir, include_version, architectures):
_keep_only_children(repository_ctx, repository_ctx.path(sysroot_dir), ["base"] + architectures)
_keep_only_children(repository_ctx, repository_ctx.path("{}/base".format(sysroot_dir)), ["c"])
- _keep_only_children(repository_ctx, repository_ctx.path("{}/base/c".format(sysroot_dir)), ["Include"])
+ _keep_only_children(repository_ctx, repository_ctx.path("{}/base/c".format(sysroot_dir)), ["Include", "bin"])
_keep_only_children(repository_ctx, repository_ctx.path("{}/base/c/Include".format(sysroot_dir)), [include_version])
_keep_only_children(
repository_ctx,
repository_ctx.path("{}/base/c/Include/{}".format(sysroot_dir, include_version)),
["ucrt", "shared", "um", "winrt"],
)
+
+ # Resource and manifest tools share the selected SDK's versioned bin tree.
+ bin_dir = "{}/base/c/bin".format(sysroot_dir)
+ _keep_only_children(repository_ctx, repository_ctx.path(bin_dir), [include_version])
+ _keep_only_children(repository_ctx, repository_ctx.path(bin_dir + "/" + include_version), architectures)

seen_architectures = {}
for arch in architectures:
diff --git a/windows/private/extensions/windows_sdk.BUILD.bazel b/windows/private/extensions/windows_sdk.BUILD.bazel
--- a/windows/private/extensions/windows_sdk.BUILD.bazel
+++ b/windows/private/extensions/windows_sdk.BUILD.bazel
@@ -19,6 +19,7 @@
name = "sysroot_files",
srcs = glob(
["__WINSDK_DIR__/**"],
+ exclude = ["__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/**"],
allow_empty = True,
) + _LOGICAL_ALIASES,
)
@@ -210,6 +211,7 @@
"**/*.hh",
"**/*.hpp",
],
+ exclude = ["__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/**"],
allow_empty = True,
) + [
f
@@ -222,6 +224,7 @@
name = "libs",
srcs = glob(
["**/*.lib"],
+ exclude = ["__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/**"],
allow_empty = True,
) + [
f
@@ -229,3 +232,33 @@
if f.endswith(".lib")
],
)
+
+# Native build tools are opt-in; ordinary sysroot users keep only headers/libs.
+
+directory(
+ name = "winsdk_tools_x64_files",
+ srcs = glob(
+ ["__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/x64/**"],
+ allow_empty = True,
+ ),
+)
+
+subdirectory(
+ name = "winsdk_tools_x64",
+ parent = ":winsdk_tools_x64_files",
+ path = "__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/x64",
+)
+
+directory(
+ name = "winsdk_tools_arm64_files",
+ srcs = glob(
+ ["__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/arm64/**"],
+ allow_empty = True,
+ ),
+)
+
+subdirectory(
+ name = "winsdk_tools_arm64",
+ parent = ":winsdk_tools_arm64_files",
+ path = "__WINSDK_DIR__/base/c/bin/__WINSDK_INCLUDE_VERSION__/arm64",
+)
Loading