aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJakub Konka <kubkon@jakubkonka.com>2023-08-30 22:30:42 +0200
committerJakub Konka <kubkon@jakubkonka.com>2023-08-30 22:30:42 +0200
commit19a1332ca140274d03e57d31fda7748a8a3641ba (patch)
treebde89cc3ac3b7bf543a84eaa116a32b794e249fb /src
parenta7240f0c99426a546b05f7e8bb086805a2766ea9 (diff)
downloadzig-19a1332ca140274d03e57d31fda7748a8a3641ba.tar.gz
zig-19a1332ca140274d03e57d31fda7748a8a3641ba.zip
macho: improve formatting of invalid targets in libraries
Diffstat (limited to 'src')
-rw-r--r--src/link/MachO.zig15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index 7cde05cf04..ff5547cc19 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -4912,12 +4912,17 @@ pub fn handleAndReportParseError(
error.InvalidTarget, error.InvalidTargetFatLibrary => {
var targets_string = std.ArrayList(u8).init(self.base.allocator);
defer targets_string.deinit();
- try targets_string.writer().writeAll("(");
- for (ctx.detected_targets.items) |t| {
- try targets_string.writer().print("{s}, ", .{t});
+
+ if (ctx.detected_targets.items.len > 1) {
+ try targets_string.writer().writeAll("(");
+ for (ctx.detected_targets.items) |t| {
+ try targets_string.writer().print("{s}, ", .{t});
+ }
+ try targets_string.resize(targets_string.items.len - 2);
+ try targets_string.writer().writeAll(")");
+ } else {
+ try targets_string.writer().writeAll(ctx.detected_targets.items[0]);
}
- try targets_string.resize(targets_string.items.len - 2);
- try targets_string.writer().writeAll(")");
switch (err) {
error.InvalidTarget => try self.reportParseError(