Commit c53a556a61fabbfa664d0bc433d0edf8092ee0db | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-01-07 19:07:24-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-01-07 19:07:33-07:00
log	c53a556a61fabbfa664d0bc433d0edf8092ee0db
tree	acc7df3dbe3e57a51bfeedc55c179e7fc0d1d67c
parent	01e34c1cd9a1cb56563e6c611c19d864c81de3c3

This branch makes WriteFileStep use the same hashing algorithm as our
cache system, reducing the divergence between zig build and the cache
system.

2 files changed, 3 insertions(+), 5 deletions(-)

lib/std/build/ConfigHeaderStep.zig-1

...	...	@@ -135,7 +135,6 @@ fn make(step: *Step) !void {
135	135	self.output_dir = try std.fs.path.join(gpa, &[_][]const u8{
136	136	self.builder.cache_root, "o", &hash_basename,
137	137	});
138
139	138	var dir = std.fs.cwd().makeOpenPath(self.output_dir, .{}) catch \|err\| {
140	139	std.debug.print("unable to make path {s}: {s}\n", .{ self.output_dir, @errorName(err) });
141	140	return err;

lib/std/build/WriteFileStep.zig+3-4

...	...	@@ -82,16 +82,15 @@ fn make(step: *Step) !void {
82	82	}
83	83	var digest: [16]u8 = undefined;
84	84	hash.final(&digest);
85		var hash_basename: [64]u8 = undefined;
	85	var hash_basename: [digest.len * 2]u8 = undefined;
86	86	_ = std.fmt.bufPrint(
87	87	&hash_basename,
88	88	"{s}",
89	89	.{std.fmt.fmtSliceHexLower(&digest)},
90	90	) catch unreachable;
	91
91	92	self.output_dir = try fs.path.join(self.builder.allocator, &[_][]const u8{
92		self.builder.cache_root,
93		"o",
94		&hash_basename,
	93	self.builder.cache_root, "o", &hash_basename,
95	94	});
96	95	var dir = fs.cwd().makeOpenPath(self.output_dir, .{}) catch \|err\| {
97	96	std.debug.print("unable to make path {s}: {s}\n", .{ self.output_dir, @errorName(err) });