Merge remote-tracking branch 'origin/master' into llvm16

1 files changed, 24 insertions, 11 deletions

diff --git a/lib/std/Build/RemoveDirStep.zig b/lib/std/Build/RemoveDirStep.zig
index f3b71dcec1..a5bf3c3256 100644
--- a/lib/std/Build/RemoveDirStep.zig
+++ b/lib/std/Build/RemoveDirStep.zig
@@ -1,5 +1,4 @@
 const std = @import("../std.zig");
-const log = std.log;
 const fs = std.fs;
 const Step = std.Build.Step;
 const RemoveDirStep = @This();
@@ -7,23 +6,37 @@ const RemoveDirStep = @This();
 pub const base_id = .remove_dir;
 
 step: Step,
-builder: *std.Build,
 dir_path: []const u8,
 
-pub fn init(builder: *std.Build, dir_path: []const u8) RemoveDirStep {
+pub fn init(owner: *std.Build, dir_path: []const u8) RemoveDirStep {
     return RemoveDirStep{
-        .builder = builder,
-        .step = Step.init(.remove_dir, builder.fmt("RemoveDir {s}", .{dir_path}), builder.allocator, make),
-        .dir_path = builder.dupePath(dir_path),
+        .step = Step.init(.{
+            .id = .remove_dir,
+            .name = owner.fmt("RemoveDir {s}", .{dir_path}),
+            .owner = owner,
+            .makeFn = make,
+        }),
+        .dir_path = owner.dupePath(dir_path),
     };
 }
 
-fn make(step: *Step) !void {
+fn make(step: *Step, prog_node: *std.Progress.Node) !void {
+    // TODO update progress node while walking file system.
+    // Should the standard library support this use case??
+    _ = prog_node;
+
+    const b = step.owner;
     const self = @fieldParentPtr(RemoveDirStep, "step", step);
 
-    const full_path = self.builder.pathFromRoot(self.dir_path);
-    fs.cwd().deleteTree(full_path) catch |err| {
-        log.err("Unable to remove {s}: {s}", .{ full_path, @errorName(err) });
-        return err;
+    b.build_root.handle.deleteTree(self.dir_path) catch |err| {
+        if (b.build_root.path) |base| {
+            return step.fail("unable to recursively delete path '{s}/{s}': {s}", .{
+                base, self.dir_path, @errorName(err),
+            });
+        } else {
+            return step.fail("unable to recursively delete path '{s}': {s}", .{
+                self.dir_path, @errorName(err),
+            });
+        }
     };
 }