diff options
| author | Michael Dusan <michael.dusan@gmail.com> | 2023-09-23 12:44:54 -0400 |
|---|---|---|
| committer | Michael Dusan <michael.dusan@gmail.com> | 2023-09-25 15:53:04 -0400 |
| commit | f3ff0b6e6df1148978bab32c9f37bfcd3452fad0 (patch) | |
| tree | 629f19720e328031cde0d2576e841903530ebc1f /src | |
| parent | f40c6a5c47b83bce7ef09afcecc1de621e19d4fa (diff) | |
| download | zig-f3ff0b6e6df1148978bab32c9f37bfcd3452fad0.tar.gz zig-f3ff0b6e6df1148978bab32c9f37bfcd3452fad0.zip | |
macos: discontinue redundant search/link for libc
Diffstat (limited to 'src')
| -rw-r--r-- | src/link/MachO.zig | 21 | ||||
| -rw-r--r-- | src/link/MachO/zld.zig | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 735a36a9df..f27350ef0d 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -676,27 +676,6 @@ pub fn resolveLibSystem( .weak = false, .path = libsystem_path, }); - - const ext = fs.path.extension(libsystem_path); - if (mem.eql(u8, ext, ".dylib")) { - // We found 'libSystem.dylib', so now we also need to look for 'libc.dylib'. - success: { - if (self.base.options.sysroot) |root| { - const dir = try fs.path.join(tmp_arena, &[_][]const u8{ root, "usr", "lib" }); - if (try accessLibPath(tmp_arena, &test_path, &checked_paths, dir, "libc")) break :success; - } - - for (search_dirs) |dir| if (try accessLibPath( - tmp_arena, - &test_path, - &checked_paths, - dir, - "libc", - )) break :success; - - try self.reportMissingLibraryError(checked_paths.items, "unable to find libc system library", .{}); - } - } } fn accessLibPath( diff --git a/src/link/MachO/zld.zig b/src/link/MachO/zld.zig index 057f990c55..d6fc1c9f03 100644 --- a/src/link/MachO/zld.zig +++ b/src/link/MachO/zld.zig @@ -317,7 +317,6 @@ pub fn linkWithZld( try argv.append(full_out_path); try argv.append("-lSystem"); - try argv.append("-lc"); for (options.system_libs.keys()) |l_name| { const info = options.system_libs.get(l_name).?; |