diff options
| author | Carl Åstholm <carl@astholm.se> | 2024-03-02 23:32:01 +0100 |
|---|---|---|
| committer | Carl Åstholm <carl@astholm.se> | 2024-04-07 15:34:46 +0200 |
| commit | ff0bec60b73a4698cda39588ec98ef06b0ecb50e (patch) | |
| tree | 360b1c1dad183b3b48e029b8b101bafa08179e6e /lib/std/Build/Step/InstallFile.zig | |
| parent | 0b7123f41d66bdda4da29d59623299d47b29aefb (diff) | |
| download | zig-ff0bec60b73a4698cda39588ec98ef06b0ecb50e.tar.gz zig-ff0bec60b73a4698cda39588ec98ef06b0ecb50e.zip | |
Remove `dest_builder` field from `InstallDir/File`
This is no longer needed after the installed headers refactoring.
Diffstat (limited to 'lib/std/Build/Step/InstallFile.zig')
| -rw-r--r-- | lib/std/Build/Step/InstallFile.zig | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/std/Build/Step/InstallFile.zig b/lib/std/Build/Step/InstallFile.zig index ca5a986fd1..1ad9fa7d5d 100644 --- a/lib/std/Build/Step/InstallFile.zig +++ b/lib/std/Build/Step/InstallFile.zig @@ -11,9 +11,6 @@ step: Step, source: LazyPath, dir: InstallDir, dest_rel_path: []const u8, -/// This is used by the build system when a file being installed comes from one -/// package but is being installed by another. -dest_builder: *std.Build, pub fn create( owner: *std.Build, @@ -34,7 +31,6 @@ pub fn create( .source = source.dupe(owner), .dir = dir.dupe(owner), .dest_rel_path = owner.dupePath(dest_rel_path), - .dest_builder = owner, }; source.addStepDependencies(&self.step); return self; @@ -42,11 +38,10 @@ pub fn create( fn make(step: *Step, prog_node: *std.Progress.Node) !void { _ = prog_node; - const src_builder = step.owner; + const b = step.owner; const self: *InstallFile = @fieldParentPtr("step", step); - const dest_builder = self.dest_builder; - const full_src_path = self.source.getPath2(src_builder, step); - const full_dest_path = dest_builder.getInstallPath(self.dir, self.dest_rel_path); + const full_src_path = self.source.getPath2(b, step); + const full_dest_path = b.getInstallPath(self.dir, self.dest_rel_path); const cwd = std.fs.cwd(); const prev = std.fs.Dir.updateFile(cwd, full_src_path, cwd, full_dest_path, .{}) catch |err| { return step.fail("unable to update file from '{s}' to '{s}': {s}", .{ |