Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2428 from ghostty-org/push-spqssprnrpun

Browse Source 
build: use the native target for generic macos target by default
This commit is contained in:
Mitchell Hashimoto
2024-10-09 14:18:19 -07:00
committed by GitHub
parent 640eaf3795 124ffb3ecb
commit 2f009b7262
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.zig
View File

@ -729,7 +729,10 @@ pub fn build(b: *std.Build) !void {
// Force all Mac builds to use a `generic` CPU. This avoids // Force all Mac builds to use a `generic` CPU. This avoids
// potential issues with `highway` compile errors due to missing // potential issues with `highway` compile errors due to missing
// `arm_neon` features (see for example https://github.com/mitchellh/ghostty/issues/1640). // `arm_neon` features (see for example https://github.com/mitchellh/ghostty/issues/1640).
const test_target = if (target.result.os.tag == .macos and builtin.target.isDarwin()) genericMacOSTarget(b) else target; const test_target = if (target.result.os.tag == .macos and builtin.target.isDarwin())
genericMacOSTarget(b, null)
else
target;
const main_test = b.addTest(.{ const main_test = b.addTest(.{
.name = "ghostty-test", .name = "ghostty-test",
@ -781,9 +784,9 @@ fn osVersionMin(tag: std.Target.Os.Tag) ?std.Target.Query.OsVersion {
// Returns a ResolvedTarget for a mac with a `target.result.cpu.model.name` of `generic`. // Returns a ResolvedTarget for a mac with a `target.result.cpu.model.name` of `generic`.
// `b.standardTargetOptions()` returns a more specific cpu like `apple_a15`. // `b.standardTargetOptions()` returns a more specific cpu like `apple_a15`.
fn genericMacOSTarget(b: *std.Build) ResolvedTarget { fn genericMacOSTarget(b: *std.Build, arch: ?std.Target.Cpu.Arch) ResolvedTarget {
return b.resolveTargetQuery(.{ return b.resolveTargetQuery(.{
.cpu_arch = .aarch64, .cpu_arch = arch orelse builtin.target.cpu.arch,
.os_tag = .macos, .os_tag = .macos,
.os_version_min = osVersionMin(.macos), .os_version_min = osVersionMin(.macos),
}); });
@ -816,7 +819,7 @@ fn createMacOSLib(
const lib = b.addStaticLibrary(.{ const lib = b.addStaticLibrary(.{
.name = "ghostty", .name = "ghostty",
.root_source_file = b.path("src/main_c.zig"), .root_source_file = b.path("src/main_c.zig"),
.target = genericMacOSTarget(b), .target = genericMacOSTarget(b, .aarch64),
.optimize = optimize, .optimize = optimize,
}); });
lib.bundle_compiler_rt = true; lib.bundle_compiler_rt = true;
@ -840,11 +843,7 @@ fn createMacOSLib(
const lib = b.addStaticLibrary(.{ const lib = b.addStaticLibrary(.{
.name = "ghostty", .name = "ghostty",
.root_source_file = b.path("src/main_c.zig"), .root_source_file = b.path("src/main_c.zig"),
.target = b.resolveTargetQuery(.{ .target = genericMacOSTarget(b, .x86_64),
.cpu_arch = .x86_64,
.os_tag = .macos,
.os_version_min = osVersionMin(.macos),
}),
.optimize = optimize, .optimize = optimize,
}); });
lib.bundle_compiler_rt = true; lib.bundle_compiler_rt = true;