@@ -514,7 +514,7 @@ pub const AllErrors = struct {
514
514
}
515
515
ttyconf .setColor (stderr , .Reset );
516
516
for (plain .notes ) | note | {
517
- try note .renderToWriter (ttyconf , stderr , "error " , .Red , indent + 4 );
517
+ try note .renderToWriter (ttyconf , stderr , "note " , .Cyan , indent + 4 );
518
518
}
519
519
},
520
520
}
@@ -5025,7 +5025,7 @@ pub fn lockAndSetMiscFailure(
5025
5025
return setMiscFailure (comp , tag , format , args );
5026
5026
}
5027
5027
5028
- fn parseLddStderr (comp : * Compilation , comptime prefix : []const u8 , stderr : []const u8 ) Allocator.Error ! void {
5028
+ fn parseLldStderr (comp : * Compilation , comptime prefix : []const u8 , stderr : []const u8 ) Allocator.Error ! void {
5029
5029
var context_lines = std .ArrayList ([]const u8 ).init (comp .gpa );
5030
5030
defer context_lines .deinit ();
5031
5031
@@ -5037,7 +5037,10 @@ fn parseLddStderr(comp: *Compilation, comptime prefix: []const u8, stderr: []con
5037
5037
err .context_lines = context_lines .toOwnedSlice ();
5038
5038
}
5039
5039
5040
- const duped_msg = try comp .gpa .dupe (u8 , line );
5040
+ var split = std .mem .split (u8 , line , "error: " );
5041
+ _ = split .first ();
5042
+
5043
+ const duped_msg = try std .fmt .allocPrint (comp .gpa , "{s}: {s}" , .{ prefix , split .rest () });
5041
5044
errdefer comp .gpa .free (duped_msg );
5042
5045
5043
5046
current_err = try comp .lld_errors .addOne (comp .gpa );
@@ -5065,7 +5068,7 @@ pub fn lockAndParseLldStderr(comp: *Compilation, comptime prefix: []const u8, st
5065
5068
comp .mutex .lock ();
5066
5069
defer comp .mutex .unlock ();
5067
5070
5068
- comp .parseLddStderr (prefix , stderr ) catch comp .setAllocFailure ();
5071
+ comp .parseLldStderr (prefix , stderr ) catch comp .setAllocFailure ();
5069
5072
}
5070
5073
5071
5074
pub fn dump_argv (argv : []const []const u8 ) void {
0 commit comments