diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-10-02 10:45:56 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-10-02 10:45:56 -0700 |
| commit | dde0adcb363f3a3f306c0fc9eaec511cc3b74965 (patch) | |
| tree | 9388d039a0b77211936c7264f5a3179f63ad51e6 /src/Compilation.zig | |
| parent | c4cd592f0e1eeff5a4056796610d97010ae4e38c (diff) | |
| parent | 7a2624c3e40e2386a4a8a775b839e1d67608ec42 (diff) | |
| download | zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.tar.gz zig-dde0adcb363f3a3f306c0fc9eaec511cc3b74965.zip | |
Merge branch 'llvm13'
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 76a84701ce..95337de1e1 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -2725,7 +2725,7 @@ fn reportRetryableCObjectError( const c_obj_err_msg = try comp.gpa.create(CObject.ErrorMsg); errdefer comp.gpa.destroy(c_obj_err_msg); - const msg = try std.fmt.allocPrint(comp.gpa, "unable to build C object: {s}", .{@errorName(err)}); + const msg = try std.fmt.allocPrint(comp.gpa, "{s}", .{@errorName(err)}); errdefer comp.gpa.free(msg); c_obj_err_msg.* = .{ .msg = msg, @@ -2797,6 +2797,8 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P const tracy = trace(@src()); defer tracy.end(); + log.debug("updating C object: {s}", .{c_object.src.src_path}); + if (c_object.clearStatus(comp.gpa)) { // There was previous failure. const lock = comp.mutex.acquire(); |