From ea9f2513a3b57aa4fda7825ca407672ce8d9da31 Mon Sep 17 00:00:00 2001
From: Jakub Konka <kubkon@jakubkonka.com>
Date: Tue, 29 Aug 2023 22:26:58 +0200
Subject: [PATCH] macho: format parse error for fat libs to include CPU archs
 only

---
 src/link/MachO.zig | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index b5eb7910e0ffa6344285303f041260839465de74..59781f38af770c7a0bd54f65d7df1b552d0ee62d 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -716,6 +716,7 @@ fn resolveLib(
 const ParseError = error{
     UnknownFileType,
     InvalidTarget,
+    InvalidTargetFatLibrary,
     DylibAlreadyExists,
     IncompatibleDylibVersion,
     OutOfMemory,
@@ -856,7 +857,7 @@ pub fn parseFatLibrary(
         for (fat_archs) |arch| {
             ctx.detected_targets.appendAssumeCapacity(try ctx.arena.dupe(u8, @tagName(arch.tag)));
         }
-        return error.InvalidTarget;
+        return error.InvalidTargetFatLibrary;
     };
     return offset;
 }
@@ -4871,7 +4872,7 @@ pub fn handleAndReportParseError(
     switch (err) {
         error.DylibAlreadyExists => {},
         error.UnknownFileType => try self.reportParseError(path, "unknown file type", .{}),
-        error.InvalidTarget => {
+        error.InvalidTarget, error.InvalidTargetFatLibrary => {
             var targets_string = std.ArrayList(u8).init(self.base.allocator);
             defer targets_string.deinit();
             try targets_string.writer().writeAll("(");
@@ -4880,10 +4881,20 @@ pub fn handleAndReportParseError(
             }
             try targets_string.resize(targets_string.items.len - 2);
             try targets_string.writer().writeAll(")");
-            try self.reportParseError(path, "invalid target: expected '{}', but found '{s}'", .{
-                Platform.fromTarget(self.base.options.target).fmtTarget(cpu_arch),
-                targets_string.items,
-            });
+
+            switch (err) {
+                error.InvalidTarget => try self.reportParseError(
+                    path,
+                    "invalid target: expected '{}', but found '{s}'",
+                    .{ Platform.fromTarget(self.base.options.target).fmtTarget(cpu_arch), targets_string.items },
+                ),
+                error.InvalidTargetFatLibrary => try self.reportParseError(
+                    path,
+                    "invalid architecture in univeral library: expected '{s}', but found '{s}'",
+                    .{ @tagName(cpu_arch), targets_string.items },
+                ),
+                else => unreachable,
+            }
         },
         else => |e| try self.reportParseError(path, "{s}: parsing object failed", .{@errorName(e)}),
     }
-- 
2.54.0