Commit 9e50f96087

Andrew Kelley <andrew@ziglang.org>
2023-08-02 06:09:12
MachO: put system_libs into libs not positionals
Putting them in both causes collisions because the same lib ends up being linked in twice. Putting them in positionals instead of libs makes their properties about needed and weak being ignored.
master
1 parent 2725c20
Changed files (1)
src
link
MachO
zld.zig
src/link/MachO/zld.zig
@@ -3549,17 +3549,12 @@ pub fn linkWithZld(macho_file: *MachO, comp: *Compilation, prog_node: *std.Progr
             try positionals.append(comp.libcxx_static_lib.?.full_object_path);
         }
 
-        {
-            // Add all system library paths to positionals.
-            const vals = options.system_libs.values();
-            try positionals.ensureUnusedCapacity(vals.len);
-            for (vals) |info| positionals.appendAssumeCapacity(info.path);
-        }
-
         var libs = std.StringArrayHashMap(link.SystemLib).init(arena);
 
-        for (options.system_libs.values()) |v| {
-            try libs.put(v.path, v);
+        {
+            const vals = options.system_libs.values();
+            try libs.ensureUnusedCapacity(vals.len);
+            for (vals) |v| libs.putAssumeCapacity(v.path, v);
         }
 
         try MachO.resolveLibSystem(arena, comp, options.sysroot, target, options.lib_dirs, &libs);