From eadac4763135717ace3a7809ec5d6413b1699fcd Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Fri, 24 Jun 2022 22:02:15 +0200 Subject: [PATCH] cli: let the linker resolve libs into dynamic and static Unlike targeting ELF-based OSes such as Linux, resolving system libs on Darwin should follow one of two strategies: `-search_paths_first` or `-search_dylibs_first` and hence we defer always forcing linking a static library to the linker. --- src/main.zig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main.zig b/src/main.zig index 9cf50e1193..3d65875975 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2152,6 +2152,7 @@ fn buildOutputType( } for (lib_dirs.items) |lib_dir_path| { + if (cross_target.isDarwin()) break; // Targeting Darwin we let the linker resolve the libraries in the correct order test_path.clearRetainingCapacity(); try test_path.writer().print("{s}" ++ sep ++ "{s}{s}{s}", .{ lib_dir_path,