mirror of
https://github.com/openai/codex.git
synced 2026-09-10 20:26:47 +00:00
1c40ffe427
## What changed - Add explicit x64 and ARM64 targets for native builds, runtime preparation, and linking using the existing voice recipes. Each target requires native Windows execution of the matching architecture. - Declare compiler, SDK, Python, and CMake inputs; require an explicitly supplied Cygwin/pkgconf tool tree and a fixed `SystemRoot`. Validate installed tool selections against the manifest and declared files. - Pair Windows DLLs with SDK import libraries, preserve plugin and receipt runfiles, and omit Unix runtime-search flags. Use Python for portable payload copying. - Correct the MSVC ARM64 tool directory casing to `HostArm64` and document provisioning and build commands. The generic Rust-consumer aliases remain separate; native Windows Bazel execution and consumer validation are still needed to establish complete Windows voice support. ## Testing Add eight unit tests covering tool selection, path anchoring, invalid inputs, and DLL/import-library copying, plus x64 and ARM64 link smoke targets that reference `gst_version`. GitOrigin-RevId: fb2b4998e9ffb5b64ca830ebf4bb4633fc959eb9
167 lines
6.1 KiB
Diff
167 lines
6.1 KiB
Diff
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,20 @@
|
|
_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), ["HostArm64" if arch == "arm64" else "Host" + arch for arch in architectures])
|
|
+ for arch in architectures:
|
|
+ host = "HostArm64" if arch == "arm64" else "Host" + arch
|
|
+ _keep_only_children(repository_ctx, repository_ctx.path(bin_dir + "/" + host), [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",
|
|
+)
|