mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-25 23:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

macho: try frameworks before libs non-exclusive

Browse Source
This commit is contained in:
Jakub Konka 2024-01-24 14:45:54 +01:00
parent d8d6ea6af2
commit dc4ef6d5d0
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/link/MachO.zig
View File

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