| author | |
| committer | |
| log | 139734154070b0e229df4c6c0e3297badd1d4fdc |
| tree | e85d813d94b3294639250d49f51aafb479d9d831 |
| parent | aa852f737b7504e01d0a4cd08c115ae508bb81c7 |
Fixes a merge conflict with one of mlugg's recent branches.1 files changed, 1 insertions(+), 0 deletions(-)
src/Compilation.zig+1| ... | @@ -3941,6 +3941,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: *std.Progress.Node) any | ... | @@ -3941,6 +3941,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: *std.Progress.Node) any |
| 3941 | .cc_argv = &.{}, | 3941 | .cc_argv = &.{}, |
| 3942 | .parent = null, | 3942 | .parent = null, |
| 3943 | .builtin_mod = null, | 3943 | .builtin_mod = null, |
| 3944 | .builtin_modules = null, // there is only one module in this compilation | ||
| 3944 | }); | 3945 | }); |
| 3945 | const bin_basename = try std.zig.binNameAlloc(arena, .{ | 3946 | const bin_basename = try std.zig.binNameAlloc(arena, .{ |
| 3946 | .root_name = root_name, | 3947 | .root_name = root_name, |