authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-08-30 22:30:42+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-08-30 22:30:42+02:00
log19a1332ca140274d03e57d31fda7748a8a3641ba
treebde89cc3ac3b7bf543a84eaa116a32b794e249fb
parenta7240f0c99426a546b05f7e8bb086805a2766ea9

macho: improve formatting of invalid targets in libraries

1 files changed, 10 insertions(+), 5 deletions(-)

src/link/MachO.zig+10-5
...@@ -4912,12 +4912,17 @@ pub fn handleAndReportParseError(...@@ -4912,12 +4912,17 @@ pub fn handleAndReportParseError(
4912 error.InvalidTarget, error.InvalidTargetFatLibrary => {4912 error.InvalidTarget, error.InvalidTargetFatLibrary => {
4913 var targets_string = std.ArrayList(u8).init(self.base.allocator);4913 var targets_string = std.ArrayList(u8).init(self.base.allocator);
4914 defer targets_string.deinit();4914 defer targets_string.deinit();
4915 try targets_string.writer().writeAll("(");4915
4916 for (ctx.detected_targets.items) |t| {4916 if (ctx.detected_targets.items.len > 1) {
4917 try targets_string.writer().print("{s}, ", .{t});4917 try targets_string.writer().writeAll("(");
4918 for (ctx.detected_targets.items) |t| {
4919 try targets_string.writer().print("{s}, ", .{t});
4920 }
4921 try targets_string.resize(targets_string.items.len - 2);
4922 try targets_string.writer().writeAll(")");
4923 } else {
4924 try targets_string.writer().writeAll(ctx.detected_targets.items[0]);
4918 }4925 }
4919 try targets_string.resize(targets_string.items.len - 2);
4920 try targets_string.writer().writeAll(")");
49214926
4922 switch (err) {4927 switch (err) {
4923 error.InvalidTarget => try self.reportParseError(4928 error.InvalidTarget => try self.reportParseError(