From 2187744411047d3ce9ec199913cd0bcba323633b Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Fri, 1 Sep 2023 00:43:02 +0200 Subject: [PATCH] macho: we actually care about stem and not basename for dependencies --- src/link/MachO.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 27d0deb350..0265ed5c5f 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -1113,7 +1113,7 @@ pub fn parseDependentLibs(self: *MachO, dependent_libs: anytype) !void { const parent = &self.dylibs.items[dep_id.parent]; const weak = parent.weak; const dirname = fs.path.dirname(dep_id.id.name) orelse ""; - const basename = fs.path.basename(dep_id.id.name); + const stem = fs.path.stem(dep_id.id.name); var arena_allocator = std.heap.ArenaAllocator.init(gpa); defer arena_allocator.deinit(); @@ -1125,10 +1125,10 @@ pub fn parseDependentLibs(self: *MachO, dependent_libs: anytype) !void { success: { if (self.base.options.sysroot) |root| { const dir = try fs.path.join(arena, &[_][]const u8{ root, dirname }); - if (try accessLibPath(gpa, &test_path, &checked_paths, dir, basename)) break :success; + if (try accessLibPath(gpa, &test_path, &checked_paths, dir, stem)) break :success; } - if (try accessLibPath(gpa, &test_path, &checked_paths, dirname, basename)) break :success; + if (try accessLibPath(gpa, &test_path, &checked_paths, dirname, stem)) break :success; try self.reportMissingLibraryError( checked_paths.items,