diff --git a/pkg/breakpad/build.zig b/pkg/breakpad/build.zig index 1c1bb3e51..24b9ec79a 100644 --- a/pkg/breakpad/build.zig +++ b/pkg/breakpad/build.zig @@ -14,7 +14,7 @@ pub fn build(b: *std.Build) !void { lib.linkLibCpp(); lib.addIncludePath(upstream.path("src")); lib.addIncludePath(b.path("vendor")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } @@ -29,7 +29,7 @@ pub fn build(b: *std.Build) !void { .flags = flags.items, }); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { lib.addCSourceFiles(.{ .root = upstream.path(""), .files = common_apple, diff --git a/pkg/cimgui/build.zig b/pkg/cimgui/build.zig index 4b5d56963..37706c9b9 100644 --- a/pkg/cimgui/build.zig +++ b/pkg/cimgui/build.zig @@ -76,7 +76,7 @@ pub fn build(b: *std.Build) !void { .flags = flags.items, }); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { if (!target.query.isNative()) { try @import("apple_sdk").addPaths(b, &lib.root_module); try @import("apple_sdk").addPaths(b, module); diff --git a/pkg/freetype/build.zig b/pkg/freetype/build.zig index 6ff4f4340..07457bc76 100644 --- a/pkg/freetype/build.zig +++ b/pkg/freetype/build.zig @@ -69,7 +69,7 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu }); lib.linkLibC(); lib.addIncludePath(upstream.path("include")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/glslang/build.zig b/pkg/glslang/build.zig index 35cffc01e..17d6f2eab 100644 --- a/pkg/glslang/build.zig +++ b/pkg/glslang/build.zig @@ -16,7 +16,7 @@ pub fn build(b: *std.Build) !void { module.addIncludePath(upstream.path("")); module.addIncludePath(b.path("override")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, module); } @@ -53,7 +53,7 @@ fn buildGlslang( lib.linkLibCpp(); lib.addIncludePath(upstream.path("")); lib.addIncludePath(b.path("override")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig index 5b7d86408..6d7f87c75 100644 --- a/pkg/harfbuzz/build.zig +++ b/pkg/harfbuzz/build.zig @@ -95,7 +95,7 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu lib.addIncludePath(upstream.path("src")); module.addIncludePath(upstream.path("src")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { try apple_sdk.addPaths(b, &lib.root_module); try apple_sdk.addPaths(b, module); } diff --git a/pkg/highway/build.zig b/pkg/highway/build.zig index 93d76876b..de518a708 100644 --- a/pkg/highway/build.zig +++ b/pkg/highway/build.zig @@ -21,7 +21,7 @@ pub fn build(b: *std.Build) !void { lib.addIncludePath(upstream.path("")); module.addIncludePath(upstream.path("")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); try apple_sdk.addPaths(b, module); diff --git a/pkg/libintl/build.zig b/pkg/libintl/build.zig index de7ba2b47..ab8d18654 100644 --- a/pkg/libintl/build.zig +++ b/pkg/libintl/build.zig @@ -42,7 +42,7 @@ pub fn build(b: *std.Build) !void { lib.addIncludePath(upstream.path("gettext-runtime/intl")); lib.addIncludePath(upstream.path("gettext-runtime/intl/gnulib-lib")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/libpng/build.zig b/pkg/libpng/build.zig index 753084f62..59770db3f 100644 --- a/pkg/libpng/build.zig +++ b/pkg/libpng/build.zig @@ -15,7 +15,7 @@ pub fn build(b: *std.Build) !void { if (target.result.os.tag == .linux) { lib.linkSystemLibrary("m"); } - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/macos/build.zig b/pkg/macos/build.zig index a154b24fa..f69ecc864 100644 --- a/pkg/macos/build.zig +++ b/pkg/macos/build.zig @@ -38,7 +38,7 @@ pub fn build(b: *std.Build) !void { module.linkFramework("Carbon", .{}); } - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { module.linkFramework("CoreFoundation", .{}); module.linkFramework("CoreGraphics", .{}); module.linkFramework("CoreText", .{}); diff --git a/pkg/oniguruma/build.zig b/pkg/oniguruma/build.zig index da7c90674..1d1b63cb2 100644 --- a/pkg/oniguruma/build.zig +++ b/pkg/oniguruma/build.zig @@ -68,7 +68,7 @@ fn buildLib(b: *std.Build, module: *std.Build.Module, options: anytype) !*std.Bu lib.addIncludePath(upstream.path("src")); module.addIncludePath(upstream.path("src")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/sentry/build.zig b/pkg/sentry/build.zig index 855490c0a..11556dcf6 100644 --- a/pkg/sentry/build.zig +++ b/pkg/sentry/build.zig @@ -23,7 +23,7 @@ pub fn build(b: *std.Build) !void { lib.linkLibC(); lib.addIncludePath(upstream.path("include")); lib.addIncludePath(upstream.path("src")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); try apple_sdk.addPaths(b, module); diff --git a/pkg/simdutf/build.zig b/pkg/simdutf/build.zig index 1532e4a33..1f8a3f38b 100644 --- a/pkg/simdutf/build.zig +++ b/pkg/simdutf/build.zig @@ -12,7 +12,7 @@ pub fn build(b: *std.Build) !void { lib.linkLibCpp(); lib.addIncludePath(b.path("vendor")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/spirv-cross/build.zig b/pkg/spirv-cross/build.zig index 8281a5df1..c8fda65ed 100644 --- a/pkg/spirv-cross/build.zig +++ b/pkg/spirv-cross/build.zig @@ -42,7 +42,7 @@ fn buildSpirvCross( }); lib.linkLibC(); lib.linkLibCpp(); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/utfcpp/build.zig b/pkg/utfcpp/build.zig index f148acbba..6830e3ca7 100644 --- a/pkg/utfcpp/build.zig +++ b/pkg/utfcpp/build.zig @@ -14,7 +14,7 @@ pub fn build(b: *std.Build) !void { lib.linkLibCpp(); lib.addIncludePath(upstream.path("")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/pkg/wuffs/build.zig b/pkg/wuffs/build.zig index 438f714d3..a98300bd1 100644 --- a/pkg/wuffs/build.zig +++ b/pkg/wuffs/build.zig @@ -13,7 +13,7 @@ pub fn build(b: *std.Build) !void { .link_libc = true, }); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, module); } diff --git a/pkg/zlib/build.zig b/pkg/zlib/build.zig index 10a937a36..53a366b07 100644 --- a/pkg/zlib/build.zig +++ b/pkg/zlib/build.zig @@ -13,7 +13,7 @@ pub fn build(b: *std.Build) !void { }); lib.linkLibC(); lib.addIncludePath(upstream.path("")); - if (target.result.isDarwin()) { + if (target.result.os.tag.isDarwin()) { const apple_sdk = @import("apple_sdk"); try apple_sdk.addPaths(b, &lib.root_module); } diff --git a/src/build/Config.zig b/src/build/Config.zig index 3ad7f47da..b5e5adb4f 100644 --- a/src/build/Config.zig +++ b/src/build/Config.zig @@ -69,7 +69,7 @@ pub fn init(b: *std.Build) !Config { // If we're building for macOS and we're on macOS, we need to // use a generic target to workaround compilation issues. - if (result.result.os.tag == .macos and builtin.target.isDarwin()) { + if (result.result.os.tag == .macos and builtin.target.os.tag.isDarwin()) { result = genericMacOSTarget(b, null); } @@ -331,7 +331,7 @@ pub fn init(b: *std.Build) !Config { bool, "emit-xcframework", "Build and install the xcframework for the macOS library.", - ) orelse builtin.target.isDarwin() and + ) orelse builtin.target.os.tag.isDarwin() and target.result.os.tag == .macos and config.app_runtime == .none and (!config.emit_bench and @@ -366,7 +366,7 @@ pub fn init(b: *std.Build) !Config { .{ // If we're not on darwin we want to use whatever the // default is via the system package mode - .default = if (target.result.isDarwin()) false else null, + .default = if (target.result.os.tag.isDarwin()) false else null, }, ); } diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig index 28eb7fa68..d349cc78a 100644 --- a/src/build/SharedDeps.zig +++ b/src/build/SharedDeps.zig @@ -320,7 +320,7 @@ pub fn add( // We always require the system SDK so that our system headers are available. // This makes things like `os/log.h` available for cross-compiling. - if (step.rootModuleTarget().isDarwin()) { + if (step.rootModuleTarget().os.tag.isDarwin()) { try @import("apple_sdk").addPaths(b, &step.root_module); const metallib = self.metallib.?; @@ -363,7 +363,7 @@ pub fn add( }).module("zf")); // Mac Stuff - if (step.rootModuleTarget().isDarwin()) { + if (step.rootModuleTarget().os.tag.isDarwin()) { const objc_dep = b.dependency("zig_objc", .{ .target = target, .optimize = optimize, diff --git a/src/build_config.zig b/src/build_config.zig index b80247aab..31418a14e 100644 --- a/src/build_config.zig +++ b/src/build_config.zig @@ -80,7 +80,7 @@ pub const Artifact = enum { wasm_module, pub fn detect() Artifact { - if (builtin.target.isWasm()) { + if (builtin.target.cpu.arch.isWasm()) { assert(builtin.output_mode == .Obj); assert(builtin.link_mode == .Static); return .wasm_module; diff --git a/src/font/main.zig b/src/font/main.zig index ffeb42f7a..4c192844f 100644 --- a/src/font/main.zig +++ b/src/font/main.zig @@ -30,7 +30,7 @@ pub const Library = library.Library; // If we're targeting wasm then we export some wasm APIs. comptime { - if (builtin.target.isWasm()) { + if (builtin.target.cpu.arch.isWasm()) { _ = Atlas.Wasm; _ = DeferredFace.Wasm; _ = face.web_canvas.Wasm; @@ -91,7 +91,7 @@ pub const Backend = enum { // macOS also supports "coretext_freetype" but there is no scenario // that is the default. It is only used by people who want to // self-compile Ghostty and prefer the freetype aesthetic. - return if (target.isDarwin()) .coretext else .fontconfig_freetype; + return if (target.os.tag.isDarwin()) .coretext else .fontconfig_freetype; } // All the functions below can be called at comptime or runtime to diff --git a/src/renderer.zig b/src/renderer.zig index d968ab4df..ea3eb1b97 100644 --- a/src/renderer.zig +++ b/src/renderer.zig @@ -48,7 +48,7 @@ pub const Impl = enum { }; } - if (target.isDarwin()) return .metal; + if (target.os.tag.isDarwin()) return .metal; return .opengl; } };