srctree

Jakub Konka parent 7b9165b3 023d1ac6 78f2ae7f
Merge pull request #17531 from moosichu/fix/frameworks

Fix some frameworks not linking macos

src/link/MachO.zig added: 15, removed: 4, total 11

@@ -707,6 +707,17 @@ fn accessLibPath(

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;

}

src/main.zig added: 15, removed: 4, total 11

@@ -6956,9 +6956,9 @@ fn accessFrameworkPath(

) !bool {

const sep = fs.path.sep_str;

for (&[_][]const u8{ "tbd", "dylib" }) |ext| {

for (&[_][]const u8{ ".tbd", ".dylib", "" }) |ext| {

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_name,