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

Merge pull request #1308 from mitchellh/build-change

Browse Source 
build: no more resolved target hack for macOS
This commit is contained in:
Mitchell Hashimoto
2024-01-15 15:09:42 -08:00
committed by GitHub
parent e1a1fad0d1 8d4416995b
commit e4aa17a2dc
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/glslang/build.zig
View File

@ -4,7 +4,11 @@ pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{}); const optimize = b.standardOptimizeOption(.{});
const module = b.addModule("glslang", .{ .root_source_file = .{ .path = "main.zig" } }); const module = b.addModule("glslang", .{
.root_source_file = .{ .path = "main.zig" },
.target = target,
.optimize = optimize,
});
const upstream = b.dependency("glslang", .{}); const upstream = b.dependency("glslang", .{});
const lib = try buildGlslang(b, upstream, target, optimize); const lib = try buildGlslang(b, upstream, target, optimize);
@ -13,9 +17,6 @@ pub fn build(b: *std.Build) !void {
module.addIncludePath(upstream.path("")); module.addIncludePath(upstream.path(""));
module.addIncludePath(.{ .path = "override" }); module.addIncludePath(.{ .path = "override" });
if (target.result.isDarwin()) { if (target.result.isDarwin()) {
// See pkg/harfbuzz/build.zig
module.resolved_target = target;
defer module.resolved_target = null;
const apple_sdk = @import("apple_sdk"); const apple_sdk = @import("apple_sdk");
try apple_sdk.addPaths(b, module); try apple_sdk.addPaths(b, module);
} }

9
pkg/harfbuzz/build.zig
View File

@ -18,6 +18,8 @@ pub fn build(b: *std.Build) !void {
const module = b.addModule("harfbuzz", .{ const module = b.addModule("harfbuzz", .{
.root_source_file = .{ .path = "main.zig" }, .root_source_file = .{ .path = "main.zig" },
.target = target,
.optimize = optimize,
.imports = &.{ .imports = &.{
.{ .name = "freetype", .module = freetype.module("freetype") }, .{ .name = "freetype", .module = freetype.module("freetype") },
.{ .name = "macos", .module = macos.module("macos") }, .{ .name = "macos", .module = macos.module("macos") },
@ -35,13 +37,6 @@ pub fn build(b: *std.Build) !void {
module.addIncludePath(upstream.path("src")); module.addIncludePath(upstream.path("src"));
if (target.result.isDarwin()) { if (target.result.isDarwin()) {
// This is definitely super sketchy and not right but without this
// zig build test breaks on macOS. We have to look into what exactly
// is going on here but this getting comitted in the interest of
// unblocking zig build test.
module.resolved_target = target;
defer module.resolved_target = null;
try apple_sdk.addPaths(b, &lib.root_module); try apple_sdk.addPaths(b, &lib.root_module);
try apple_sdk.addPaths(b, module); try apple_sdk.addPaths(b, module);
} }