motiejus/zig
1
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Jakub Konka
2023-09-01 00:43:02 +02:00
parent 611ddd426c
commit 2187744411
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/link/MachO.zig
View File

@@ -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,