| ... | @@ -1500,11 +1500,11 @@ pub fn doPrelinkTask(comp: *Compilation, task: PrelinkTask) void { | ... | @@ -1500,11 +1500,11 @@ pub fn doPrelinkTask(comp: *Compilation, task: PrelinkTask) void { |
| 1500 | base.loadInput(input) catch |err| switch (err) { | 1500 | base.loadInput(input) catch |err| switch (err) { |
| 1501 | error.AlreadyReported => return, // error reported via diags | 1501 | error.AlreadyReported => return, // error reported via diags |
| 1502 | else => |e| switch (input) { | 1502 | else => |e| switch (input) { |
| 1503 | .dso => |dso| diags.addParseError(dso.path, "failed to parse shared library: {s}", .{@errorName(e)}), | 1503 | .dso => |dso| diags.addParseError(dso.path, "failed to parse shared library: {t}", .{e}), |
| 1504 | .object => |obj| diags.addParseError(obj.path, "failed to parse object: {s}", .{@errorName(e)}), | 1504 | .object => |obj| diags.addParseError(obj.path, "failed to parse object: {t}", .{e}), |
| 1505 | .archive => |obj| diags.addParseError(obj.path, "failed to parse archive: {s}", .{@errorName(e)}), | 1505 | .archive => |obj| diags.addParseError(obj.path, "failed to parse archive: {t}", .{e}), |
| 1506 | .res => |res| diags.addParseError(res.path, "failed to parse Windows resource: {s}", .{@errorName(e)}), | 1506 | .res => |res| diags.addParseError(res.path, "failed to parse Windows resource: {t}", .{e}), |
| 1507 | .dso_exact => diags.addError("failed to handle dso_exact: {s}", .{@errorName(e)}), | 1507 | .dso_exact => diags.addError("failed to handle dso_exact: {t}", .{e}), |
| 1508 | }, | 1508 | }, |
| 1509 | }; | 1509 | }; |
| 1510 | prog_node.completeOne(); | 1510 | prog_node.completeOne(); |
| ... | @@ -1927,6 +1927,7 @@ pub fn hashInputs(man: *Cache.Manifest, link_inputs: []const Input) !void { | ... | @@ -1927,6 +1927,7 @@ pub fn hashInputs(man: *Cache.Manifest, link_inputs: []const Input) !void { |
| 1927 | .object, .archive => |obj| { | 1927 | .object, .archive => |obj| { |
| 1928 | _ = try man.addInputPath(obj.path, .{ | 1928 | _ = try man.addInputPath(obj.path, .{ |
| 1929 | .handle = .{ .file = obj.file }, | 1929 | .handle = .{ .file = obj.file }, |
| | 1930 | .request_handle = true, |
| 1930 | }); | 1931 | }); |
| 1931 | man.hash.add(obj.must_link); | 1932 | man.hash.add(obj.must_link); |
| 1932 | man.hash.add(obj.hidden); | 1933 | man.hash.add(obj.hidden); |
| ... | @@ -1934,11 +1935,13 @@ pub fn hashInputs(man: *Cache.Manifest, link_inputs: []const Input) !void { | ... | @@ -1934,11 +1935,13 @@ pub fn hashInputs(man: *Cache.Manifest, link_inputs: []const Input) !void { |
| 1934 | .res => |res| { | 1935 | .res => |res| { |
| 1935 | _ = try man.addInputPath(res.path, .{ | 1936 | _ = try man.addInputPath(res.path, .{ |
| 1936 | .handle = .{ .file = res.file }, | 1937 | .handle = .{ .file = res.file }, |
| | 1938 | .request_handle = true, |
| 1937 | }); | 1939 | }); |
| 1938 | }, | 1940 | }, |
| 1939 | .dso => |dso| { | 1941 | .dso => |dso| { |
| 1940 | _ = try man.addInputPath(dso.path, .{ | 1942 | _ = try man.addInputPath(dso.path, .{ |
| 1941 | .handle = .{ .file = dso.file }, | 1943 | .handle = .{ .file = dso.file }, |
| | 1944 | .request_handle = true, |
| 1942 | }); | 1945 | }); |
| 1943 | man.hash.add(dso.needed); | 1946 | man.hash.add(dso.needed); |
| 1944 | man.hash.add(dso.weak); | 1947 | man.hash.add(dso.weak); |