mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17531 from moosichu/fix/frameworks

Browse Source 
Fix some frameworks not linking macos
This commit is contained in:
Jakub Konka 2023-10-16 20:45:04 +02:00 committed by GitHub
commit 78f2ae7f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/link/MachO.zig
View File

@ -707,6 +707,17 @@ fn accessLibPath(
return true; return true;
} }
noextension: {
test_path.clearRetainingCapacity();
try test_path.writer().print("{s}" ++ sep ++ "{s}", .{ search_dir, lib_name });
try checked_paths.append(try gpa.dupe(u8, test_path.items));
fs.cwd().access(test_path.items, .{}) catch |err| switch (err) {
error.FileNotFound => break :noextension,
else => |e| return e,
};
return true;
}
return false; return false;
} }

4
src/main.zig
View File

@ -6956,9 +6956,9 @@ fn accessFrameworkPath(
) !bool { ) !bool {
const sep = fs.path.sep_str; const sep = fs.path.sep_str;
for (&[_][]const u8{ "tbd", "dylib" }) |ext| { for (&[_][]const u8{ ".tbd", ".dylib", "" }) |ext| {
test_path.clearRetainingCapacity(); test_path.clearRetainingCapacity();
try test_path.writer().print("{s}" ++ sep ++ "{s}.framework" ++ sep ++ "{s}.{s}", .{ try test_path.writer().print("{s}" ++ sep ++ "{s}.framework" ++ sep ++ "{s}{s}", .{
framework_dir_path, framework_dir_path,
framework_name, framework_name,
framework_name, framework_name,