authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-08-04 10:54:14-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-08-04 10:54:14-07:00
logf0354179a88d9c8274e571dc1e62a29e9c58376b
treed1bc3ccf6ba7570c6eb2a1af5bd29491d471dfc3
parent988613be67133ce6f2de3ac8b3f2e63f610c4470

fetch: remove --global-cache-dir argument

This must be set with an env var now, just like `zig build` because by the time we make it to the child process it is too late, the global cache directory has already been observed. closes #36144

1 files changed, 0 insertions(+), 4 deletions(-)

lib/compiler/Maker.zig-4
...@@ -1439,7 +1439,6 @@ fn cmdFetch(gpa: Allocator, graph: *Graph, args: []const []const u8) !void {...@@ -1439,7 +1439,6 @@ fn cmdFetch(gpa: Allocator, graph: *Graph, args: []const []const u8) !void {
14391439
1440 const color: Color = Color.settingFromEnvironment(environ_map);1440 const color: Color = Color.settingFromEnvironment(environ_map);
1441 var opt_path_or_url: ?[]const u8 = null;1441 var opt_path_or_url: ?[]const u8 = null;
1442 var override_global_cache_dir: ?[]const u8 = EnvVar.ZIG_GLOBAL_CACHE_DIR.get(environ_map);
1443 var override_local_cache_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_CACHE_DIR.get(environ_map);1442 var override_local_cache_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_CACHE_DIR.get(environ_map);
1444 var override_pkg_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_PKG_DIR.get(environ_map);1443 var override_pkg_dir: ?[]const u8 = EnvVar.ZIG_LOCAL_PKG_DIR.get(environ_map);
1445 var debug_hash: bool = false;1444 var debug_hash: bool = false;
...@@ -1455,8 +1454,6 @@ fn cmdFetch(gpa: Allocator, graph: *Graph, args: []const []const u8) !void {...@@ -1455,8 +1454,6 @@ fn cmdFetch(gpa: Allocator, graph: *Graph, args: []const []const u8) !void {
1455 if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {1454 if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
1456 try Io.File.stdout().writeStreamingAll(io, usage_fetch);1455 try Io.File.stdout().writeStreamingAll(io, usage_fetch);
1457 return process.cleanExit(io);1456 return process.cleanExit(io);
1458 } else if (mem.eql(u8, arg, "--global-cache-dir")) {
1459 override_global_cache_dir = nextArgOrFatal(args, &arg_i);
1460 } else if (mem.eql(u8, arg, "--cache-dir")) {1457 } else if (mem.eql(u8, arg, "--cache-dir")) {
1461 override_local_cache_dir = nextArgOrFatal(args, &arg_i);1458 override_local_cache_dir = nextArgOrFatal(args, &arg_i);
1462 } else if (mem.eql(u8, arg, "--pkg-dir")) {1459 } else if (mem.eql(u8, arg, "--pkg-dir")) {
...@@ -1736,7 +1733,6 @@ const usage_fetch =...@@ -1736,7 +1733,6 @@ const usage_fetch =
1736 \\1733 \\
1737 \\Options:1734 \\Options:
1738 \\ -h, --help Print this help and exit1735 \\ -h, --help Print this help and exit
1739 \\ --global-cache-dir [path] Override path to global Zig cache directory
1740 \\ --cache-dir [path] Override path to local cache directory1736 \\ --cache-dir [path] Override path to local cache directory
1741 \\ --pkg-dir [path] Override path to local package directory1737 \\ --pkg-dir [path] Override path to local package directory
1742 \\ --debug-hash Print verbose hash information to stdout1738 \\ --debug-hash Print verbose hash information to stdout