motiejus/zig
1
Fork 0
Code Releases Activity

Remove dest_builder field from InstallDir/File

Browse Source 
This is no longer needed after the installed headers refactoring.
This commit is contained in:
Carl Åstholm
2024-03-02 23:32:01 +01:00
parent 0b7123f41d
commit ff0bec60b7
2 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/Build/Step/InstallFile.zig
View File

@@ -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}", .{