aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJakub Konka <kubkon@jakubkonka.com>2024-01-24 14:45:54 +0100
committerJakub Konka <kubkon@jakubkonka.com>2024-01-25 12:07:04 +0100
commitdc4ef6d5d05f3e8b99ec38628a3f671a9268236f (patch)
treeefea1ab609a47789090842fe72ac5dd4d6701a64 /src
parentd8d6ea6af25af7ecfea1351c652c51de49169536 (diff)
downloadzig-dc4ef6d5d05f3e8b99ec38628a3f671a9268236f.tar.gz
zig-dc4ef6d5d05f3e8b99ec38628a3f671a9268236f.zip
macho: try frameworks before libs non-exclusive
Diffstat (limited to 'src')
-rw-r--r--src/link/MachO.zig24
1 files 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,
+
+ // 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;