Skip to content

fix: gate Electron's extra Win SDK siso headers on target OS, not host #840

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
codebytere merged 1 commit into from
Apr 8, 2026
+9 −6
Merged

fix: gate Electron's extra Win SDK siso headers on target OS, not host #840

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
15 changes: 9 additions & 6 deletions tools/main.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,21 @@ def init(ctx):
"clang_large": step_config["platforms"]["default"],
})

if runtime.os == "windows":
# Add additional Windows SDK headers needed by Electron
# Add additional Windows SDK headers needed by Electron. Use
# win_sdk.enabled() (target_os == "win") rather than runtime.os so this
# also applies when cross-compiling Windows on a Linux host.
if win_sdk.enabled(ctx):
win_toolchain_dir = win_sdk.toolchain_dir(ctx)
if win_toolchain_dir:
sdk_version = gn_logs.read(ctx).get("windows_sdk_version")
sdk_version = gn_logs.read(ctx).get("windows_sdk_version")
if win_toolchain_dir and sdk_version and (win_toolchain_dir + ":headers") in step_config["input_deps"]:
step_config["input_deps"][win_toolchain_dir + ":headers"].extend([
# third_party/electron_node/deps/uv/include/uv/win.h includes mswsock.h
path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/mswsock.h"),
# third_party/electron_node/src/debug_utils.cc includes lm.h
path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/Lm.h"),
path.join(win_toolchain_dir, "Windows Kits/10/Include", sdk_version, "um/Lm.h"),
])


if runtime.os == "windows":
# Update platforms to match our default siso config instead of reclient configs.
step_config["platforms"].update({
"clang-cl": step_config["platforms"]["default"],
Expand Down