mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix glslang compilation on Windows with MSVC

Browse Source 
Apply the same MSVC fixes used for simdutf and highway: conditionally
skip linkLibCpp on MSVC since Zig's bundled libc++ headers conflict
with MSVC's own C++ runtime, and add -std=c++17 for C++17 features
like std::variant and inline variables that glslang requires.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Alessandro De Blasis
2026-03-24 08:05:40 +01:00
parent 014873e539
commit 74c6ffe78e
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/glslang/build.zig
View File

@@ -51,7 +51,14 @@ fn buildGlslang(
.linkage = .static,
});
lib.linkLibC();
lib.linkLibCpp();
// On MSVC, we must not use linkLibCpp because Zig unconditionally
// passes -nostdinc++ and then adds its bundled libc++/libc++abi
// include paths, which conflict with MSVC's own C++ runtime headers.
// The MSVC SDK include directories (added via linkLibC) contain
// both C and C++ headers, so linkLibCpp is not needed.
if (target.result.abi != .msvc) {
lib.linkLibCpp();
}
if (upstream_) |upstream| lib.addIncludePath(upstream.path(""));
lib.addIncludePath(b.path("override"));
if (target.result.os.tag.isDarwin()) {
@@ -65,6 +72,10 @@ fn buildGlslang(
"-fno-sanitize=undefined",
"-fno-sanitize-trap=undefined",
});
// MSVC requires explicit std specification otherwise C++17 features
// like std::variant, std::filesystem, and inline variables are
// guarded behind _HAS_CXX17.
try flags.append(b.allocator, "-std=c++17");
if (target.result.os.tag == .freebsd or target.result.abi == .musl) {
try flags.append(b.allocator, "-fPIC");