diff --git a/build.zig b/build.zig index f0093f693..5a998bdbd 100644 --- a/build.zig +++ b/build.zig @@ -792,7 +792,7 @@ fn addDeps( // 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()) { - try @import("apple_sdk").addPaths(b, step); + try @import("apple_sdk").addPaths(b, &step.root_module); } // We always need the Zig packages diff --git a/pkg/apple-sdk/build.zig b/pkg/apple-sdk/build.zig index 602526052..2f883e129 100644 --- a/pkg/apple-sdk/build.zig +++ b/pkg/apple-sdk/build.zig @@ -7,7 +7,7 @@ pub fn build(b: *std.Build) !void { _ = optimize; } -pub fn addPaths(b: *std.Build, step: anytype) !void { +pub fn addPaths(b: *std.Build, m: *std.Build.Module) !void { // The active SDK we want to use const sdk = "MacOSX14.sdk"; @@ -19,19 +19,19 @@ pub fn addPaths(b: *std.Build, step: anytype) !void { " \r\n", ); - step.addSystemFrameworkPath(.{ + m.addSystemFrameworkPath(.{ .cwd_relative = b.pathJoin(&.{ path, "Platforms/MacOSX.platform/Developer/SDKs/" ++ sdk ++ "/System/Library/Frameworks", }), }); - step.addSystemIncludePath(.{ + m.addSystemIncludePath(.{ .cwd_relative = b.pathJoin(&.{ path, "Platforms/MacOSX.platform/Developer/SDKs/" ++ sdk ++ "/usr/include", }), }); - step.addLibraryPath(.{ + m.addLibraryPath(.{ .cwd_relative = b.pathJoin(&.{ path, "Platforms/MacOSX.platform/Developer/SDKs/" ++ sdk ++ "/usr/lib", diff --git a/pkg/cimgui/build.zig b/pkg/cimgui/build.zig index e1ad769b0..b846671fa 100644 --- a/pkg/cimgui/build.zig +++ b/pkg/cimgui/build.zig @@ -60,7 +60,7 @@ pub fn build(b: *std.Build) !void { if (target.result.isDarwin()) { if (!target.query.isNative()) { - try @import("apple_sdk").addPaths(b, lib); + try @import("apple_sdk").addPaths(b, &lib.root_module); try @import("apple_sdk").addPaths(b, module); } lib.addCSourceFile(.{ diff --git a/pkg/harfbuzz/build.zig b/pkg/harfbuzz/build.zig index c1eb91ec9..8efd532d9 100644 --- a/pkg/harfbuzz/build.zig +++ b/pkg/harfbuzz/build.zig @@ -61,7 +61,7 @@ pub fn build(b: *std.Build) !void { }); if (coretext_enabled) { try flags.appendSlice(&.{"-DHAVE_CORETEXT=1"}); - try apple_sdk.addPaths(b, lib); + try apple_sdk.addPaths(b, &lib.root_module); try apple_sdk.addPaths(b, module); lib.linkFramework("ApplicationServices"); module.linkFramework("ApplicationServices", .{}); diff --git a/pkg/macos/build.zig b/pkg/macos/build.zig index 556e1f1ce..5d2108ed2 100644 --- a/pkg/macos/build.zig +++ b/pkg/macos/build.zig @@ -38,7 +38,7 @@ pub fn build(b: *std.Build) !void { module.linkFramework("CoreVideo", .{}); if (!target.query.isNative()) { - try apple_sdk.addPaths(b, lib); + try apple_sdk.addPaths(b, &lib.root_module); try apple_sdk.addPaths(b, module); } }