| author |  Matthew Lugg <mlugg@mlugg.co.uk> 2025-05-22 03:26:11+01:00 |
| committer | Matthew Lugg <mlugg@mlugg.co.uk> 2025-05-22 08:43:37+01:00 |
| log | 9a3540d61e57535b719b32942a4bc9ac065cbeac |
| tree | 9defecc1fd368737191fc12b4552260bd316c994 |
| parent | 931c6f90f588e5b923e59c38efade9dfd92cd0dd |
std.Build: resolved generated paths are cwd-relative
The doc comment here agreed with the implementation, but not with *any*
`Step` which populates a `GeneratedFile`, where they are treated as
cwd-relative. This is the obvious correct choice, because these paths
usually come from joining onto a cache root, and those are cwd-relative
if not absolute.
This was a pre-existing bug, but #23836 caused it to trigger more often,
because the compiler now commonly passes the local cache directory to
the build runner process as a relative path where it was previously an
absolute path.
Resolves: #239541 files changed, 2 insertions(+), 2 deletions(-)
lib- std
lib/std/Build.zig+2-2
| ... | ... | @@ -2443,12 +2443,12 @@ pub const GeneratedFile = struct { |
| 2443 | 2443 | /// The step that generates the file |
| 2444 | 2444 | step: *Step, |
| 2445 | 2445 | |
| 2446 | /// The path to the generated file. Must be either absolute or relative to the build root. | |
| 2446 | /// The path to the generated file. Must be either absolute or relative to the build runner cwd. | |
| 2447 | 2447 | /// This value must be set in the `fn make()` of the `step` and must not be `null` afterwards. |
| 2448 | 2448 | path: ?[]const u8 = null, |
| 2449 | 2449 | |
| 2450 | 2450 | pub fn getPath(gen: GeneratedFile) []const u8 { |
| 2451 | return gen.step.owner.pathFromRoot(gen.path orelse std.debug.panic( | |
| 2451 | return gen.step.owner.pathFromCwd(gen.path orelse std.debug.panic( | |
| 2452 | 2452 | "getPath() was called on a GeneratedFile that wasn't built yet. Is there a missing Step dependency on step '{s}'?", |
| 2453 | 2453 | .{gen.step.name}, |
| 2454 | 2454 | )); |