mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-30 10:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: put linker symlink for cache invalidation in zig-cache

Browse Source 
Due to differences in where the output gets emitted in stage1 and stage2,
we were putting the symlink next to the binary rather than in `zig-cache`
directory when building with stage2.
This commit is contained in:
Jakub Konka 2022-02-12 18:54:08 +01:00
parent d542a588c6
commit 16ec848d2a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/link/MachO.zig
View File

@ -507,6 +507,15 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
const allow_undef = is_dyn_lib and (self.base.options.allow_shlib_undefined orelse false);
const id_symlink_basename = "zld.id";
const cache_dir_handle = blk: {
if (use_stage1) {
break :blk directory.handle;
}
if (self.base.options.module) |module| {
break :blk module.zig_cache_artifact_directory.handle;
}
break :blk directory.handle;
};
var man: Cache.Manifest = undefined;
defer if (!self.base.options.disable_lld_caching) man.deinit();
@ -552,7 +561,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
var prev_digest_buf: [digest.len]u8 = undefined;
const prev_digest: []u8 = Cache.readSmallFile(
directory.handle,
cache_dir_handle,
id_symlink_basename,
&prev_digest_buf,
) catch |err| blk: {
@ -588,7 +597,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
});
// We are about to change the output file to be different, so we invalidate the build hash now.
directory.handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
cache_dir_handle.deleteFile(id_symlink_basename) catch |err| switch (err) {
error.FileNotFound => {},
else => |e| return e,
};
@ -621,7 +630,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
} else {
if (use_stage1) {
const sub_path = self.base.options.emit.?.sub_path;
self.base.file = try directory.handle.createFile(sub_path, .{
self.base.file = try cache_dir_handle.createFile(sub_path, .{
.truncate = true,
.read = true,
.mode = link.determineMode(self.base.options),
@ -1080,7 +1089,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
if (use_stage1 and self.base.options.disable_lld_caching) break :cache;
// Update the file with the digest. If it fails we can continue; it only
// means that the next invocation will have an unnecessary cache miss.
Cache.writeSmallFile(directory.handle, id_symlink_basename, &digest) catch |err| {
Cache.writeSmallFile(cache_dir_handle, id_symlink_basename, &digest) catch |err| {
log.debug("failed to save linking hash digest file: {s}", .{@errorName(err)});
};
// Again failure here only means an unnecessary cache miss.