From 77ed1bfa525ad9d57dec7add0bc2f5ab53b9d2c8 Mon Sep 17 00:00:00 2001
From: Techatrix <techatrix@mailbox.org>
Date: Fri, 3 Jul 2026 19:33:57 +0200
Subject: [PATCH] zig build: handle passing cwd path to child processes

---
 lib/compiler/Maker.zig      | 6 +++---
 lib/compiler/configurer.zig | 2 +-
 src/main.zig                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/compiler/Maker.zig b/lib/compiler/Maker.zig
index c48e60debe05c09a450a9f2a4c382c31604f950f..62c6e879277916637d910cdb1861e4393446f73e 100644
--- a/lib/compiler/Maker.zig
+++ b/lib/compiler/Maker.zig
@@ -164,12 +164,12 @@ pub fn main(init: process.Init.Minimal) !void {
 
     const cwd: Dir = .cwd();
 
-    const zig_lib_directory: Cache.Directory = .{
+    const zig_lib_directory: Cache.Directory = if (std.mem.eql(u8, zig_lib_arg, ".")) .cwd() else .{
         .path = zig_lib_arg,
         .handle = try cwd.openDir(io, zig_lib_arg, .{}),
     };
 
-    const global_cache_directory: Cache.Directory = .{
+    const global_cache_directory: Cache.Directory = if (std.mem.eql(u8, global_cache_arg, ".")) .cwd() else .{
         .path = global_cache_arg,
         .handle = try cwd.createDirPathOpen(io, global_cache_arg, .{}),
     };
@@ -573,7 +573,7 @@ pub fn main(init: process.Init.Minimal) !void {
         unresolved_path,
         .@"local cache",
     ) else .{
-        .path = try Dir.path.join(arena, &.{ build_root.directory.path orelse ".", default_local_zig_cache_basename }),
+        .path = try build_root.directory.join(arena, &.{default_local_zig_cache_basename}),
         .handle = try build_root.directory.handle.createDirPathOpen(io, default_local_zig_cache_basename, .{}),
     };
     graph.cache = .{
diff --git a/lib/compiler/configurer.zig b/lib/compiler/configurer.zig
index a4f82bb391b5e35f2ab6cbdb67ec84d2208ae089..b956ee1716db56768de7e872b7d09345881651b3 100644
--- a/lib/compiler/configurer.zig
+++ b/lib/compiler/configurer.zig
@@ -68,7 +68,7 @@ pub fn main(init: process.Init.Minimal) !void {
 
     const cwd: Io.Dir = .cwd();
 
-    const build_root: std.Build.Cache.Path = .{
+    const build_root: std.Build.Cache.Path = if (std.mem.eql(u8, build_root_sub_path, ".")) .cwd() else .{
         .root_dir = .{
             .handle = try cwd.openDir(io, build_root_sub_path, .{}),
             .path = build_root_sub_path,
diff --git a/src/main.zig b/src/main.zig
index a7182be42eab77d15582da3ffc9341c855f72d55..8f569d2a856e039466416c5bd3e810a1a0d15610 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5065,11 +5065,11 @@ fn jitCmdInner(
     if (options.prepend_cmd) |cmd|
         child_argv.appendAssumeCapacity(cmd);
     if (options.prepend_zig_lib_dir_path)
-        child_argv.appendAssumeCapacity(try arena.print("--zig-lib={s}", .{dirs.zig_lib.path.?}));
+        child_argv.appendAssumeCapacity(try arena.print("--zig-lib={s}", .{dirs.zig_lib.path orelse "."}));
     if (options.prepend_zig_exe_path)
         child_argv.appendAssumeCapacity(try arena.print("--zig={s}", .{self_exe_path}));
     if (options.prepend_global_cache_path)
-        child_argv.appendAssumeCapacity(try arena.print("--global-cache={s}", .{dirs.global_cache.path.?}));
+        child_argv.appendAssumeCapacity(try arena.print("--global-cache={s}", .{dirs.global_cache.path orelse "."}));
     if (options.prepend_seed)
         child_argv.appendAssumeCapacity(try arena.print("--seed=0x{x}", .{randInt(io, u32)}));
 
-- 
2.54.0