zig

commit dc4ef6d5d05f3e8b99ec38628a3f671a9268236f (tree)
parent d8d6ea6af25af7ecfea1351c652c51de49169536
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Wed, 24 Jan 2024 14:45:54 +0100

macho: try frameworks before libs non-exclusive

Diffstat:
M
src/link/MachO.zig
 | 
24
++++++++----------------

1 file changed, 8 insertions(+), 16 deletions(-)
diff --git 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,
+
+                    // Framework
+                    if (try resolveFramework(
+                        arena,
+                        &test_path,
+                        &checked_paths,
+                        framework_dirs,
                         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;
-                    }
+                    )) break :full_path test_path.items;
 
                     // Library
                     const lib_name = eatPrefix(stem, "lib") orelse stem;