| author |  Techatrix <techatrix@mailbox.org> 2026-07-03 19:33:57+02:00 |
| committer | Techatrix <techatrix@mailbox.org> 2026-07-03 19:33:57+02:00 |
| log | 77ed1bfa525ad9d57dec7add0bc2f5ab53b9d2c8 |
| tree | a6f985ca1ba1fdf311fffe28afc6b22c14ea65ed |
| parent | 358c43939c1f5236eec9e022e7d45f1741234948 |
| signature |  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
- src
lib/compiler/Maker.zig+3-3
| ... | @@ -164,12 +164,12 @@ pub fn main(init: process.Init.Minimal) !void { | ... | @@ -164,12 +164,12 @@ pub fn main(init: process.Init.Minimal) !void { |
| 164 | 164 | ||
| 165 | const cwd: Dir = .cwd(); | 165 | const cwd: Dir = .cwd(); |
| 166 | 166 | ||
| 167 | const zig_lib_directory: Cache.Directory = .{ | 167 | const zig_lib_directory: Cache.Directory = if (std.mem.eql(u8, zig_lib_arg, ".")) .cwd() else .{ |
| 168 | .path = zig_lib_arg, | 168 | .path = zig_lib_arg, |
| 169 | .handle = try cwd.openDir(io, zig_lib_arg, .{}), | 169 | .handle = try cwd.openDir(io, zig_lib_arg, .{}), |
| 170 | }; | 170 | }; |
| 171 | 171 | ||
| 172 | const global_cache_directory: Cache.Directory = .{ | 172 | const global_cache_directory: Cache.Directory = if (std.mem.eql(u8, global_cache_arg, ".")) .cwd() else .{ |
| 173 | .path = global_cache_arg, | 173 | .path = global_cache_arg, |
| 174 | .handle = try cwd.createDirPathOpen(io, global_cache_arg, .{}), | 174 | .handle = try cwd.createDirPathOpen(io, global_cache_arg, .{}), |
| 175 | }; | 175 | }; |
| ... | @@ -573,7 +573,7 @@ pub fn main(init: process.Init.Minimal) !void { | ... | @@ -573,7 +573,7 @@ pub fn main(init: process.Init.Minimal) !void { |
| 573 | unresolved_path, | 573 | unresolved_path, |
| 574 | .@"local cache", | 574 | .@"local cache", |
| 575 | ) else .{ | 575 | ) 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}), |
| 577 | .handle = try build_root.directory.handle.createDirPathOpen(io, default_local_zig_cache_basename, .{}), | 577 | .handle = try build_root.directory.handle.createDirPathOpen(io, default_local_zig_cache_basename, .{}), |
| 578 | }; | 578 | }; |
| 579 | graph.cache = .{ | 579 | graph.cache = .{ |
lib/compiler/configurer.zig+1-1
| ... | @@ -68,7 +68,7 @@ pub fn main(init: process.Init.Minimal) !void { | ... | @@ -68,7 +68,7 @@ pub fn main(init: process.Init.Minimal) !void { |
| 68 | 68 | ||
| 69 | const cwd: Io.Dir = .cwd(); | 69 | const cwd: Io.Dir = .cwd(); |
| 70 | 70 | ||
| 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 .{ |
| 72 | .root_dir = .{ | 72 | .root_dir = .{ |
| 73 | .handle = try cwd.openDir(io, build_root_sub_path, .{}), | 73 | .handle = try cwd.openDir(io, build_root_sub_path, .{}), |
| 74 | .path = build_root_sub_path, | 74 | .path = build_root_sub_path, |
src/main.zig+2-2
| ... | @@ -5065,11 +5065,11 @@ fn jitCmdInner( | ... | @@ -5065,11 +5065,11 @@ fn jitCmdInner( |
| 5065 | if (options.prepend_cmd) |cmd| | 5065 | if (options.prepend_cmd) |cmd| |
| 5066 | child_argv.appendAssumeCapacity(cmd); | 5066 | child_argv.appendAssumeCapacity(cmd); |
| 5067 | if (options.prepend_zig_lib_dir_path) | 5067 | 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 "."})); |
| 5069 | if (options.prepend_zig_exe_path) | 5069 | if (options.prepend_zig_exe_path) |
| 5070 | child_argv.appendAssumeCapacity(try arena.print("--zig={s}", .{self_exe_path})); | 5070 | child_argv.appendAssumeCapacity(try arena.print("--zig={s}", .{self_exe_path})); |
| 5071 | if (options.prepend_global_cache_path) | 5071 | 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 "."})); |
| 5073 | if (options.prepend_seed) | 5073 | if (options.prepend_seed) |
| 5074 | child_argv.appendAssumeCapacity(try arena.print("--seed=0x{x}", .{randInt(io, u32)})); | 5074 | child_argv.appendAssumeCapacity(try arena.print("--seed=0x{x}", .{randInt(io, u32)})); |
| 5075 | 5075 |