aboutsummaryrefslogtreecommitdiff
path: root/vendor/libghostty-vt/pkg/spirv-cross
diff options
context:
space:
mode:
authorCan Celik <ogulcancelik@gmail.com>2026-09-10 21:51:57 +0300
committerGitHub <noreply@github.com>2026-09-10 21:51:57 +0300
commit425c86179791cd32e2d4ce0ae7f269940b4b0663 (patch)
treee52c4383a6d69216cbe2a32638bf90841d7e2189 /vendor/libghostty-vt/pkg/spirv-cross
parent90e947a6e26e02f10ec7f1694c4eb5b78a86406b (diff)
chore: upgrade libghostty and preserve terminal behavior (#3906)
Diffstat (limited to 'vendor/libghostty-vt/pkg/spirv-cross')
-rw-r--r--vendor/libghostty-vt/pkg/spirv-cross/build.zig24
1 files changed, 11 insertions, 13 deletions
diff --git a/vendor/libghostty-vt/pkg/spirv-cross/build.zig b/vendor/libghostty-vt/pkg/spirv-cross/build.zig
index 72ce61eb..3b85e8f4 100644
--- a/vendor/libghostty-vt/pkg/spirv-cross/build.zig
+++ b/vendor/libghostty-vt/pkg/spirv-cross/build.zig
@@ -34,12 +34,12 @@ pub fn build(b: *std.Build) !void {
if (b.systemIntegrationOption("spirv-cross", .{})) {
module.linkSystemLibrary("spirv-cross-c-shared", dynamic_link_opts);
if (test_exe) |exe| {
- exe.linkSystemLibrary2("spirv-cross-c-shared", dynamic_link_opts);
+ exe.root_module.linkSystemLibrary("spirv-cross-c-shared", dynamic_link_opts);
}
} else {
const lib = try buildSpirvCross(b, module, target, optimize);
b.installArtifact(lib);
- if (test_exe) |exe| exe.linkLibrary(lib);
+ if (test_exe) |exe| exe.root_module.linkLibrary(lib);
}
}
@@ -54,18 +54,16 @@ fn buildSpirvCross(
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
+ .link_libc = true,
+ // 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.
+ .link_libcpp = target.result.abi != .msvc,
}),
.linkage = .static,
});
- lib.linkLibC();
- // 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 (target.result.os.tag.isDarwin()) {
const apple_sdk = @import("apple_sdk");
try apple_sdk.addPaths(b, lib);
@@ -86,9 +84,9 @@ fn buildSpirvCross(
}
if (b.lazyDependency("spirv_cross", .{})) |upstream| {
- lib.addIncludePath(upstream.path(""));
+ lib.root_module.addIncludePath(upstream.path(""));
module.addIncludePath(upstream.path(""));
- lib.addCSourceFiles(.{
+ lib.root_module.addCSourceFiles(.{
.root = upstream.path(""),
.flags = flags.items,
.files = &.{