zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

all: update xcode_frameworks

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2023-07-07 15:56:24 -07:00
parent 22edd4fb9d
commit e8cc459027
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/gpu-dawn/build.zig
View file

@ -1639,7 +1639,7 @@ fn sdkPath(comptime suffix: []const u8) []const u8 {
const xcode_frameworks = struct { const xcode_frameworks = struct {
pub fn addPaths(b: *std.Build, step: *std.build.CompileStep) void { pub fn addPaths(b: *std.Build, step: *std.build.CompileStep) void {
// branch: mach // branch: mach
xEnsureGitRepoCloned(b.allocator, "https://github.com/hexops/xcode-frameworks", "723aa55e9752c8c6c25d3413722b5fe13d72ac4f", "zig-cache/xcode_frameworks") catch |err| @panic(@errorName(err)); xEnsureGitRepoCloned(b.allocator, "https://github.com/hexops/xcode-frameworks", "723aa55e9752c8c6c25d3413722b5fe13d72ac4f", xSdkPath("/zig-cache/xcode_frameworks")) catch |err| @panic(@errorName(err));
step.addFrameworkPath("zig-cache/xcode_frameworks/Frameworks"); step.addFrameworkPath("zig-cache/xcode_frameworks/Frameworks");
step.addSystemIncludePath("zig-cache/xcode_frameworks/include"); step.addSystemIncludePath("zig-cache/xcode_frameworks/include");
@ -1653,7 +1653,7 @@ const xcode_frameworks = struct {
xEnsureGit(allocator); xEnsureGit(allocator);
if (std.fs.cwd().openDir(dir, .{})) |_| { if (std.fs.openDirAbsolute(dir, .{})) |_| {
const current_revision = try xGetCurrentGitRevision(allocator, dir); const current_revision = try xGetCurrentGitRevision(allocator, dir);
if (!std.mem.eql(u8, current_revision, revision)) { if (!std.mem.eql(u8, current_revision, revision)) {
// Reset to the desired revision // Reset to the desired revision
@ -1717,4 +1717,12 @@ const xcode_frameworks = struct {
return false; return false;
} }
} }
fn xSdkPath(comptime suffix: []const u8) []const u8 {
if (suffix[0] != '/') @compileError("suffix must be an absolute path");
return comptime blk: {
const root_dir = std.fs.path.dirname(@src().file) orelse ".";
break :blk root_dir ++ suffix;
};
}
}; };

12
libs/sysaudio/build.zig
View file

@ -147,7 +147,7 @@ fn sdkPath(comptime suffix: []const u8) []const u8 {
const xcode_frameworks = struct { const xcode_frameworks = struct {
pub fn addPaths(b: *std.Build, step: *std.build.CompileStep) void { pub fn addPaths(b: *std.Build, step: *std.build.CompileStep) void {
// branch: mach // branch: mach
xEnsureGitRepoCloned(b.allocator, "https://github.com/hexops/xcode-frameworks", "723aa55e9752c8c6c25d3413722b5fe13d72ac4f", "zig-cache/xcode_frameworks") catch |err| @panic(@errorName(err)); xEnsureGitRepoCloned(b.allocator, "https://github.com/hexops/xcode-frameworks", "723aa55e9752c8c6c25d3413722b5fe13d72ac4f", xSdkPath("/zig-cache/xcode_frameworks")) catch |err| @panic(@errorName(err));
step.addFrameworkPath("zig-cache/xcode_frameworks/Frameworks"); step.addFrameworkPath("zig-cache/xcode_frameworks/Frameworks");
step.addSystemIncludePath("zig-cache/xcode_frameworks/include"); step.addSystemIncludePath("zig-cache/xcode_frameworks/include");
@ -161,7 +161,7 @@ const xcode_frameworks = struct {
xEnsureGit(allocator); xEnsureGit(allocator);
if (std.fs.cwd().openDir(dir, .{})) |_| { if (std.fs.openDirAbsolute(dir, .{})) |_| {
const current_revision = try xGetCurrentGitRevision(allocator, dir); const current_revision = try xGetCurrentGitRevision(allocator, dir);
if (!std.mem.eql(u8, current_revision, revision)) { if (!std.mem.eql(u8, current_revision, revision)) {
// Reset to the desired revision // Reset to the desired revision
@ -225,4 +225,12 @@ const xcode_frameworks = struct {
return false; return false;
} }
} }
fn xSdkPath(comptime suffix: []const u8) []const u8 {
if (suffix[0] != '/') @compileError("suffix must be an absolute path");
return comptime blk: {
const root_dir = std.fs.path.dirname(@src().file) orelse ".";
break :blk root_dir ++ suffix;
};
}
}; };