aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2025-12-18 09:50:07 -0800
committerAndrew Kelley <andrew@ziglang.org>2025-12-23 22:15:10 -0800
commit1264469a41e89e72635c3b60b4cd3dca17876964 (patch)
treefaf1a8ae1dc20b72abd562d101684c1151732662 /src
parent54865e0483bf02bc1ace9f06c00071fce32534cc (diff)
downloadzig-1264469a41e89e72635c3b60b4cd3dca17876964.tar.gz
zig-1264469a41e89e72635c3b60b4cd3dca17876964.zip
compiler: fix build from source on macOS
Diffstat (limited to 'src')
-rw-r--r--src/link/MachO.zig6
-rw-r--r--src/main.zig5
2 files changed, 5 insertions, 6 deletions
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index b3c62db2df..513c857dbf 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -617,7 +617,7 @@ pub fn flush(
else => |e| return diags.fail("failed to write code signature: {s}", .{@errorName(e)}),
};
const emit = self.base.emit;
- invalidateKernelCache(emit.root_dir.handle, emit.sub_path) catch |err| switch (err) {
+ invalidateKernelCache(io, emit.root_dir.handle, emit.sub_path) catch |err| switch (err) {
else => |e| return diags.fail("failed to invalidate kernel cache: {t}", .{e}),
};
}
@@ -3621,11 +3621,11 @@ pub fn getTarget(self: *const MachO) *const std.Target {
/// into a new inode, remove the original file, and rename the copy to match
/// the original file. This is super messy, but there doesn't seem any other
/// way to please the XNU.
-pub fn invalidateKernelCache(dir: Io.Dir, sub_path: []const u8) !void {
+pub fn invalidateKernelCache(io: Io, dir: Io.Dir, sub_path: []const u8) !void {
const tracy = trace(@src());
defer tracy.end();
if (builtin.target.os.tag.isDarwin() and builtin.target.cpu.arch == .aarch64) {
- try dir.copyFile(sub_path, dir, sub_path, .{});
+ try dir.copyFile(sub_path, dir, sub_path, io, .{});
}
}
diff --git a/src/main.zig b/src/main.zig
index 8e30febb81..fb2a8cfe0f 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -3985,9 +3985,8 @@ fn createModule(
resolved_target.is_native_os and resolved_target.is_native_abi and
create_module.want_native_include_dirs)
{
- var paths = std.zig.system.NativePaths.detect(arena, target) catch |err| {
- fatal("unable to detect native system paths: {s}", .{@errorName(err)});
- };
+ var paths = std.zig.system.NativePaths.detect(arena, io, target) catch |err|
+ fatal("unable to detect native system paths: {t}", .{err});
for (paths.warnings.items) |warning| {
warn("{s}", .{warning});
}