| ... | @@ -1257,23 +1257,15 @@ fn parseDependentDylibs(self: *MachO) !void { | ... | @@ -1257,23 +1257,15 @@ fn parseDependentDylibs(self: *MachO) !void { |
| 1257 | const full_path = full_path: { | 1257 | const full_path = full_path: { |
| 1258 | fail: { | 1258 | fail: { |
| 1259 | const stem = std.fs.path.stem(id.name); | 1259 | const stem = std.fs.path.stem(id.name); |
| 1260 | const framework_name = try std.fmt.allocPrint(gpa, "{s}.framework" ++ std.fs.path.sep_str ++ "{s}", .{ | 1260 | |
| 1261 | stem, | 1261 | // Framework |
| | 1262 | if (try resolveFramework( |
| | 1263 | arena, |
| | 1264 | &test_path, |
| | 1265 | &checked_paths, |
| | 1266 | framework_dirs, |
| 1262 | stem, | 1267 | stem, |
| 1263 | }); | 1268 | )) break :full_path test_path.items; |
| 1264 | defer gpa.free(framework_name); | | |
| 1265 | | | |
| 1266 | if (mem.endsWith(u8, id.name, framework_name)) { | | |
| 1267 | // Framework | | |
| 1268 | if (try resolveFramework( | | |
| 1269 | arena, | | |
| 1270 | &test_path, | | |
| 1271 | &checked_paths, | | |
| 1272 | framework_dirs, | | |
| 1273 | stem, | | |
| 1274 | )) break :full_path test_path.items; | | |
| 1275 | break :fail; | | |
| 1276 | } | | |
| 1277 | | 1269 | |
| 1278 | // Library | 1270 | // Library |
| 1279 | const lib_name = eatPrefix(stem, "lib") orelse stem; | 1271 | const lib_name = eatPrefix(stem, "lib") orelse stem; |
Jakub Konka <kubkon@jakubkonka.com> 2024-01-24 14:45:54+01:00
src