authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-09-01 00:43:02+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-09-01 00:43:02+02:00
log2187744411047d3ce9ec199913cd0bcba323633b
treee215b216133384bfed7dbcf386417be38c73d0d4
parent611ddd426c6802c71c182e38afd60826889989f2

macho: we actually care about stem and not basename for dependencies

1 files changed, 3 insertions(+), 3 deletions(-)

src/link/MachO.zig+3-3
...@@ -1113,7 +1113,7 @@ pub fn parseDependentLibs(self: *MachO, dependent_libs: anytype) !void {...@@ -1113,7 +1113,7 @@ pub fn parseDependentLibs(self: *MachO, dependent_libs: anytype) !void {
1113 const parent = &self.dylibs.items[dep_id.parent];1113 const parent = &self.dylibs.items[dep_id.parent];
1114 const weak = parent.weak;1114 const weak = parent.weak;
1115 const dirname = fs.path.dirname(dep_id.id.name) orelse "";1115 const dirname = fs.path.dirname(dep_id.id.name) orelse "";
1116 const basename = fs.path.basename(dep_id.id.name);1116 const stem = fs.path.stem(dep_id.id.name);
11171117
1118 var arena_allocator = std.heap.ArenaAllocator.init(gpa);1118 var arena_allocator = std.heap.ArenaAllocator.init(gpa);
1119 defer arena_allocator.deinit();1119 defer arena_allocator.deinit();
...@@ -1125,10 +1125,10 @@ pub fn parseDependentLibs(self: *MachO, dependent_libs: anytype) !void {...@@ -1125,10 +1125,10 @@ pub fn parseDependentLibs(self: *MachO, dependent_libs: anytype) !void {
1125 success: {1125 success: {
1126 if (self.base.options.sysroot) |root| {1126 if (self.base.options.sysroot) |root| {
1127 const dir = try fs.path.join(arena, &[_][]const u8{ root, dirname });1127 const dir = try fs.path.join(arena, &[_][]const u8{ root, dirname });
1128 if (try accessLibPath(gpa, &test_path, &checked_paths, dir, basename)) break :success;1128 if (try accessLibPath(gpa, &test_path, &checked_paths, dir, stem)) break :success;
1129 }1129 }
11301130
1131 if (try accessLibPath(gpa, &test_path, &checked_paths, dirname, basename)) break :success;1131 if (try accessLibPath(gpa, &test_path, &checked_paths, dirname, stem)) break :success;
11321132
1133 try self.reportMissingLibraryError(1133 try self.reportMissingLibraryError(
1134 checked_paths.items,1134 checked_paths.items,