| author |  Andrew Kelley <andrew@ziglang.org> 2026-05-23 14:16:44-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2026-05-25 18:54:36-07:00 |
| log | fed031031dc671f961b5f1f04cffd1ea4753f3ba |
| tree | 6225dca8792f5320052323ed0582b7d618a923e4 |
| parent | b069a2eb21d4bdcbc87c566be013fa30f26d3a1e |
Maker: fix compilation on windows
2 files changed, 6 insertions(+), 4 deletions(-)
lib- compiler
- Maker
lib/compiler/Maker/Step/FindProgram.zig+1-1
| ... | ... | @@ -93,7 +93,7 @@ fn checkCandidate( |
| 93 | 93 | while (it.next()) |ext| { |
| 94 | 94 | if (!supportedWindowsProgramExtension(ext)) continue; |
| 95 | 95 | |
| 96 | const extended_path = try std.mem.concat(arena, &.{ full_path, ext }); | |
| 96 | const extended_path = try std.mem.concat(arena, u8, &.{ full_path, ext }); | |
| 97 | 97 | |
| 98 | 98 | if (Io.Dir.cwd().access(io, extended_path, .{ .execute = true })) |_| { |
| 99 | 99 | maker.generatedPath(found_path).* = .initCwd(extended_path); |
lib/compiler/Maker/Watch.zig+5-3
| ... | ... | @@ -548,9 +548,11 @@ const Os = switch (builtin.os.tag) { |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | 550 | fn update(w: *Watch, steps: []const Configuration.Step.Index) !void { |
| 551 | const gpa = w.maker.gpa; | |
| 551 | const maker = w.maker; | |
| 552 | const gpa = maker.gpa; | |
| 552 | 553 | // Add missing marks and note persisted ones. |
| 553 | for (steps) |step| { | |
| 554 | for (steps) |step_index| { | |
| 555 | const step = maker.stepByIndex(step_index); | |
| 554 | 556 | for (step.inputs.table.keys(), step.inputs.table.values()) |path, *files| { |
| 555 | 557 | const dir = dir: { |
| 556 | 558 | const gop = try w.dir_table.getOrPut(gpa, path); |
| ... | ... | @@ -579,7 +581,7 @@ const Os = switch (builtin.os.tag) { |
| 579 | 581 | for (files.items) |basename| { |
| 580 | 582 | const gop = try dir.reaction_set.getOrPut(gpa, basename); |
| 581 | 583 | if (!gop.found_existing) gop.value_ptr.* = .{}; |
| 582 | try gop.value_ptr.put(gpa, step, w.generation); | |
| 584 | try gop.value_ptr.put(gpa, step_index, w.generation); | |
| 583 | 585 | } |
| 584 | 586 | } |
| 585 | 587 | } |