mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-05-01 03:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Xcode 26, macOS Tahoe support (build tooling only)

Browse Source 
This updates our build script and CI to support Xcode 26 and macOS
Tahoe. **This doesn't update the Ghostty app to resolve any Tahoe
issues.**

For CI, we've added a new build job that runs on macOS Tahoe with Xcode
26. I've stopped short of updating our tip release job, since I think I
want to wait until I verify a bit more about Tahoe before we flip that
bit. Also, ideally, we'd run Xcode 26 on Sequoia (macOS 15) for
stability reasons and Namespace doesn't have Xcode 26 on 15 yet.

For builds, this updates our build script to find Metal binaries using
`xcodebuild -find-executable` instead of `xcrun`. The latter doesn't
work with Xcode 26, but the former does and also still works with older
Xcodes. I'm not sure if this is a bug but I did report it: FB17874042.
This commit is contained in:
Mitchell Hashimoto
2025-06-09 20:44:23 -07:00
parent 57cd5ef085
commit b0e0aadaf3
2 changed files with 83 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/build/MetallibStep.zig
View File

@@ -22,13 +22,12 @@ step: *Step,
output: LazyPath,
pub fn create(b: *std.Build, opts: Options) ?*MetallibStep {
const self = b.allocator.create(MetallibStep) catch @panic("OOM");
switch (opts.target.result.os.tag) {
.macos, .ios => {},
else => return null, // Only macOS and iOS are supported.
}
const sdk = switch (opts.target.result.os.tag) {
.macos => "macosx",
.ios => "iphoneos",
else => return null,
};
const self = b.allocator.create(MetallibStep) catch @panic("OOM");
const min_version = if (opts.target.query.os_version_min) |v|
b.fmt("{}", .{v.semver})
@@ -38,11 +37,31 @@ pub fn create(b: *std.Build, opts: Options) ?*MetallibStep {
else => unreachable,
};
// Find the metal and metallib executables. The Apple docs
// at the time of writing (June 2025) say to use
// `xcrun --sdk <sdk> metal` but this doesn't work with Xcode 26.
//
// I don't know if this is a bug but the xcodebuild approach also
// works with Xcode 15 so it seems safe to use this instead.
//
// Reported bug: FB17874042.
var code: u8 = undefined;
const metal_exe = std.mem.trim(u8, b.runAllowFail(
&.{ "xcodebuild", "-find-executable", "metal" },
&code,
.Ignore,
) catch return null, "\r\n ");
const metallib_exe = std.mem.trim(u8, b.runAllowFail(
&.{ "xcodebuild", "-find-executable", "metallib" },
&code,
.Ignore,
) catch return null, "\r\n ");
const run_ir = RunStep.create(
b,
b.fmt("metal {s}", .{opts.name}),
);
run_ir.addArgs(&.{ "/usr/bin/xcrun", "-sdk", sdk, "metal", "-o" });
run_ir.addArgs(&.{ metal_exe, "-o" });
const output_ir = run_ir.addOutputFileArg(b.fmt("{s}.ir", .{opts.name}));
run_ir.addArgs(&.{"-c"});
for (opts.sources) |source| run_ir.addFileArg(source);
@@ -62,7 +81,7 @@ pub fn create(b: *std.Build, opts: Options) ?*MetallibStep {
b,
b.fmt("metallib {s}", .{opts.name}),
);
run_lib.addArgs(&.{ "/usr/bin/xcrun", "-sdk", sdk, "metallib", "-o" });
run_lib.addArgs(&.{ metallib_exe, "-o" });
const output_lib = run_lib.addOutputFileArg(b.fmt("{s}.metallib", .{opts.name}));
run_lib.addFileArg(output_ir);
run_lib.step.dependOn(&run_ir.step);