| author |  Michael Dusan <michael.dusan@gmail.com> 2023-09-23 12:44:54-04:00 |
| committer | Michael Dusan <michael.dusan@gmail.com> 2023-09-25 15:53:04-04:00 |
| log | f3ff0b6e6df1148978bab32c9f37bfcd3452fad0 |
| tree | 629f19720e328031cde0d2576e841903530ebc1f |
| parent | f40c6a5c47b83bce7ef09afcecc1de621e19d4fa |
| signature | Commit is signed but in an unrecognized format. |
macos: discontinue redundant search/link for libc
2 files changed, 0 insertions(+), 22 deletions(-)
src/link/MachO.zig-21
| ... | @@ -676,27 +676,6 @@ pub fn resolveLibSystem( | ... | @@ -676,27 +676,6 @@ pub fn resolveLibSystem( |
| 676 | .weak = false, | 676 | .weak = false, |
| 677 | .path = libsystem_path, | 677 | .path = libsystem_path, |
| 678 | }); | 678 | }); |
| 679 | |||
| 680 | const ext = fs.path.extension(libsystem_path); | ||
| 681 | if (mem.eql(u8, ext, ".dylib")) { | ||
| 682 | // We found 'libSystem.dylib', so now we also need to look for 'libc.dylib'. | ||
| 683 | success: { | ||
| 684 | if (self.base.options.sysroot) |root| { | ||
| 685 | const dir = try fs.path.join(tmp_arena, &[_][]const u8{ root, "usr", "lib" }); | ||
| 686 | if (try accessLibPath(tmp_arena, &test_path, &checked_paths, dir, "libc")) break :success; | ||
| 687 | } | ||
| 688 | |||
| 689 | for (search_dirs) |dir| if (try accessLibPath( | ||
| 690 | tmp_arena, | ||
| 691 | &test_path, | ||
| 692 | &checked_paths, | ||
| 693 | dir, | ||
| 694 | "libc", | ||
| 695 | )) break :success; | ||
| 696 | |||
| 697 | try self.reportMissingLibraryError(checked_paths.items, "unable to find libc system library", .{}); | ||
| 698 | } | ||
| 699 | } | ||
| 700 | } | 679 | } |
| 701 | 680 | ||
| 702 | fn accessLibPath( | 681 | fn accessLibPath( |
src/link/MachO/zld.zig-1
| ... | @@ -317,7 +317,6 @@ pub fn linkWithZld( | ... | @@ -317,7 +317,6 @@ pub fn linkWithZld( |
| 317 | try argv.append(full_out_path); | 317 | try argv.append(full_out_path); |
| 318 | 318 | ||
| 319 | try argv.append("-lSystem"); | 319 | try argv.append("-lSystem"); |
| 320 | try argv.append("-lc"); | ||
| 321 | 320 | ||
| 322 | for (options.system_libs.keys()) |l_name| { | 321 | for (options.system_libs.keys()) |l_name| { |
| 323 | const info = options.system_libs.get(l_name).?; | 322 | const info = options.system_libs.get(l_name).?; |