Step.Run: Fix for convertPathArg when cwd and path args are on different drives

Fixes #25805
This commit is contained in:
Ryan Liptak 2025-11-05 20:17:07 -08:00
parent 416bf1de47
commit e0898f4e05

View File

@ -746,7 +746,12 @@ fn convertPathArg(run: *Run, path: Build.Cache.Path) []const u8 {
// Convert it from relative to *our* cwd, to relative to the *child's* cwd. // Convert it from relative to *our* cwd, to relative to the *child's* cwd.
break :rel std.fs.path.relative(b.graph.arena, child_cwd, path_str) catch @panic("OOM"); break :rel std.fs.path.relative(b.graph.arena, child_cwd, path_str) catch @panic("OOM");
}; };
assert(!std.fs.path.isAbsolute(child_cwd_rel)); // Not every path can be made relative, e.g. if the path and the child cwd are on different
// disk designators on Windows. In that case, `relative` will return an absolute path which we can
// just return.
if (std.fs.path.isAbsolute(child_cwd_rel)) {
return child_cwd_rel;
}
// We're not done yet. In some cases this path must be prefixed with './': // We're not done yet. In some cases this path must be prefixed with './':
// * On POSIX, the executable name cannot be a single component like 'foo' // * On POSIX, the executable name cannot be a single component like 'foo'
// * Some executables might treat a leading '-' like a flag, which we must avoid // * Some executables might treat a leading '-' like a flag, which we must avoid