From dc4ef6d5d05f3e8b99ec38628a3f671a9268236f Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 24 Jan 2024 14:45:54 +0100 Subject: [PATCH] macho: try frameworks before libs non-exclusive --- src/link/MachO.zig | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 3b945216bb..5574b7b6f0 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -1257,23 +1257,15 @@ fn parseDependentDylibs(self: *MachO) !void { const full_path = full_path: { fail: { const stem = std.fs.path.stem(id.name); - const framework_name = try std.fmt.allocPrint(gpa, "{s}.framework" ++ std.fs.path.sep_str ++ "{s}", .{ - stem, - stem, - }); - defer gpa.free(framework_name); - if (mem.endsWith(u8, id.name, framework_name)) { - // Framework - if (try resolveFramework( - arena, - &test_path, - &checked_paths, - framework_dirs, - stem, - )) break :full_path test_path.items; - break :fail; - } + // Framework + if (try resolveFramework( + arena, + &test_path, + &checked_paths, + framework_dirs, + stem, + )) break :full_path test_path.items; // Library const lib_name = eatPrefix(stem, "lib") orelse stem;