Step.Run: change `cwd` to `?Build.LazyPath` (#17418)

closes #17409

1 files changed, 24 insertions, 18 deletions

diff --git a/lib/std/Build/Step/Run.zig b/lib/std/Build/Step/Run.zig
index 9d8f26559c..845abe83bb 100644
--- a/lib/std/Build/Step/Run.zig
+++ b/lib/std/Build/Step/Run.zig
@@ -1,6 +1,7 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const Step = std.Build.Step;
+const Build = std.Build;
+const Step = Build.Step;
 const fs = std.fs;
 const mem = std.mem;
 const process = std.process;
@@ -19,10 +20,8 @@ step: Step,
 /// See also addArg and addArgs to modifying this directly
 argv: ArrayList(Arg),
 
-/// Set this to modify the current working directory
-/// TODO change this to a Build.Cache.Directory to better integrate with
-/// future child process cwd API.
-cwd: ?[]const u8,
+/// Use `setCwd` to set the initial current working directory
+cwd: ?Build.LazyPath,
 
 /// Override this field to modify the environment, or use setEnvironmentVariable
 env_map: ?*EnvMap,
@@ -287,6 +286,11 @@ pub fn setStdIn(self: *Run, stdin: StdIn) void {
     self.stdin = stdin;
 }
 
+pub fn setCwd(self: *Run, cwd: Build.LazyPath) void {
+    cwd.addStepDependencies(&self.step);
+    self.cwd = cwd;
+}
+
 pub fn clearEnvironment(self: *Run) void {
     const b = self.step.owner;
     const new_env_map = b.allocator.create(EnvMap) catch @panic("OOM");
@@ -650,8 +654,10 @@ fn runCommand(
     const b = step.owner;
     const arena = b.allocator;
 
-    try step.handleChildProcUnsupported(self.cwd, argv);
-    try Step.handleVerbose2(step.owner, self.cwd, self.env_map, argv);
+    const cwd: ?[]const u8 = if (self.cwd) |lazy_cwd| lazy_cwd.getPath(b) else null;
+
+    try step.handleChildProcUnsupported(cwd, argv);
+    try Step.handleVerbose2(step.owner, cwd, self.env_map, argv);
 
     const allow_skip = switch (self.stdio) {
         .check, .zig_test => self.skip_foreign_checks,
@@ -778,7 +784,7 @@ fn runCommand(
                 self.addPathForDynLibs(exe);
             }
 
-            try Step.handleVerbose2(step.owner, self.cwd, self.env_map, interp_argv.items);
+            try Step.handleVerbose2(step.owner, cwd, self.env_map, interp_argv.items);
 
             break :term spawnChildAndCollect(self, interp_argv.items, has_side_effects, prog_node) catch |e| {
                 if (!self.failing_to_execute_foreign_is_an_error) return error.MakeSkipped;
@@ -848,7 +854,7 @@ fn runCommand(
                     , .{
                         expected_bytes,
                         result.stdio.stderr.?,
-                        try Step.allocPrintCmd(arena, self.cwd, final_argv),
+                        try Step.allocPrintCmd(arena, cwd, final_argv),
                     });
                 }
             },
@@ -865,7 +871,7 @@ fn runCommand(
                     , .{
                         match,
                         result.stdio.stderr.?,
-                        try Step.allocPrintCmd(arena, self.cwd, final_argv),
+                        try Step.allocPrintCmd(arena, cwd, final_argv),
                     });
                 }
             },
@@ -882,7 +888,7 @@ fn runCommand(
                     , .{
                         expected_bytes,
                         result.stdio.stdout.?,
-                        try Step.allocPrintCmd(arena, self.cwd, final_argv),
+                        try Step.allocPrintCmd(arena, cwd, final_argv),
                     });
                 }
             },
@@ -899,7 +905,7 @@ fn runCommand(
                     , .{
                         match,
                         result.stdio.stdout.?,
-                        try Step.allocPrintCmd(arena, self.cwd, final_argv),
+                        try Step.allocPrintCmd(arena, cwd, final_argv),
                     });
                 }
             },
@@ -908,7 +914,7 @@ fn runCommand(
                     return step.fail("the following command {} (expected {}):\n{s}", .{
                         fmtTerm(result.term),
                         fmtTerm(expected_term),
-                        try Step.allocPrintCmd(arena, self.cwd, final_argv),
+                        try Step.allocPrintCmd(arena, cwd, final_argv),
                     });
                 }
             },
@@ -929,18 +935,18 @@ fn runCommand(
                     prefix,
                     fmtTerm(result.term),
                     fmtTerm(expected_term),
-                    try Step.allocPrintCmd(arena, self.cwd, final_argv),
+                    try Step.allocPrintCmd(arena, cwd, final_argv),
                 });
             }
             if (!result.stdio.test_results.isSuccess()) {
                 return step.fail(
                     "{s}the following test command failed:\n{s}",
-                    .{ prefix, try Step.allocPrintCmd(arena, self.cwd, final_argv) },
+                    .{ prefix, try Step.allocPrintCmd(arena, cwd, final_argv) },
                 );
             }
         },
         else => {
-            try step.handleChildProcessTerm(result.term, self.cwd, final_argv);
+            try step.handleChildProcessTerm(result.term, cwd, final_argv);
         },
     }
 }
@@ -963,8 +969,8 @@ fn spawnChildAndCollect(
     const arena = b.allocator;
 
     var child = std.process.Child.init(argv, arena);
-    if (self.cwd) |cwd| {
-        child.cwd = b.pathFromRoot(cwd);
+    if (self.cwd) |lazy_cwd| {
+        child.cwd = lazy_cwd.getPath(b);
     } else {
         child.cwd = b.build_root.path;
         child.cwd_dir = b.build_root.handle;