authorgravatar for techatrix@mailbox.orgTechatrix <techatrix@mailbox.org> 2026-07-03 19:33:57+02:00
committergravatar for techatrix@mailbox.orgTechatrix <techatrix@mailbox.org> 2026-07-03 19:33:57+02:00
log77ed1bfa525ad9d57dec7add0bc2f5ab53b9d2c8
treea6f985ca1ba1fdf311fffe28afc6b22c14ea65ed
parent358c43939c1f5236eec9e022e7d45f1741234948
signaturebadge-check Signed by SSH key SHA256:HYC3SjXQcAt6uwv9pu/6OoVQ2rUH8rb5zKiUHSe9uxk

zig build: handle passing cwd path to child processes

3 files changed, 6 insertions(+), 6 deletions(-)

lib/compiler/Maker.zig+3-3
......@@ -164,12 +164,12 @@ pub fn main(init: process.Init.Minimal) !void {
164164
165165 const cwd: Dir = .cwd();
166166
167 const zig_lib_directory: Cache.Directory = .{
167 const zig_lib_directory: Cache.Directory = if (std.mem.eql(u8, zig_lib_arg, ".")) .cwd() else .{
168168 .path = zig_lib_arg,
169169 .handle = try cwd.openDir(io, zig_lib_arg, .{}),
170170 };
171171
172 const global_cache_directory: Cache.Directory = .{
172 const global_cache_directory: Cache.Directory = if (std.mem.eql(u8, global_cache_arg, ".")) .cwd() else .{
173173 .path = global_cache_arg,
174174 .handle = try cwd.createDirPathOpen(io, global_cache_arg, .{}),
175175 };
......@@ -573,7 +573,7 @@ pub fn main(init: process.Init.Minimal) !void {
573573 unresolved_path,
574574 .@"local cache",
575575 ) else .{
576 .path = try Dir.path.join(arena, &.{ build_root.directory.path orelse ".", default_local_zig_cache_basename }),
576 .path = try build_root.directory.join(arena, &.{default_local_zig_cache_basename}),
577577 .handle = try build_root.directory.handle.createDirPathOpen(io, default_local_zig_cache_basename, .{}),
578578 };
579579 graph.cache = .{
lib/compiler/configurer.zig+1-1
......@@ -68,7 +68,7 @@ pub fn main(init: process.Init.Minimal) !void {
6868
6969 const cwd: Io.Dir = .cwd();
7070
71 const build_root: std.Build.Cache.Path = .{
71 const build_root: std.Build.Cache.Path = if (std.mem.eql(u8, build_root_sub_path, ".")) .cwd() else .{
7272 .root_dir = .{
7373 .handle = try cwd.openDir(io, build_root_sub_path, .{}),
7474 .path = build_root_sub_path,
src/main.zig+2-2
......@@ -5065,11 +5065,11 @@ fn jitCmdInner(
50655065 if (options.prepend_cmd) |cmd|
50665066 child_argv.appendAssumeCapacity(cmd);
50675067 if (options.prepend_zig_lib_dir_path)
5068 child_argv.appendAssumeCapacity(try arena.print("--zig-lib={s}", .{dirs.zig_lib.path.?}));
5068 child_argv.appendAssumeCapacity(try arena.print("--zig-lib={s}", .{dirs.zig_lib.path orelse "."}));
50695069 if (options.prepend_zig_exe_path)
50705070 child_argv.appendAssumeCapacity(try arena.print("--zig={s}", .{self_exe_path}));
50715071 if (options.prepend_global_cache_path)
5072 child_argv.appendAssumeCapacity(try arena.print("--global-cache={s}", .{dirs.global_cache.path.?}));
5072 child_argv.appendAssumeCapacity(try arena.print("--global-cache={s}", .{dirs.global_cache.path orelse "."}));
50735073 if (options.prepend_seed)
50745074 child_argv.appendAssumeCapacity(try arena.print("--seed=0x{x}", .{randInt(io, u32)}));
50755075