diff options
| author | Jakub Konka <kubkon@jakubkonka.com> | 2023-09-01 00:43:02 +0200 |
|---|---|---|
| committer | Jakub Konka <kubkon@jakubkonka.com> | 2023-09-01 00:43:02 +0200 |
| commit | 2187744411047d3ce9ec199913cd0bcba323633b (patch) | |
| tree | e215b216133384bfed7dbcf386417be38c73d0d4 /src | |
| parent | 611ddd426c6802c71c182e38afd60826889989f2 (diff) | |
| download | zig-2187744411047d3ce9ec199913cd0bcba323633b.tar.gz zig-2187744411047d3ce9ec199913cd0bcba323633b.zip | |
macho: we actually care about stem and not basename for dependencies
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/MachO.zig | 6 |
1 files 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, |