diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/introspect.zig | 8 | ||||
| -rw-r--r-- | src/main.zig | 2 | ||||
| -rw-r--r-- | src/stage1/all_types.hpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/introspect.zig b/src/introspect.zig index b75bf8f4b8..18cad4cf81 100644 --- a/src/introspect.zig +++ b/src/introspect.zig @@ -61,6 +61,14 @@ pub fn findZigLibDirFromSelfExe( /// Caller owns returned memory. pub fn resolveGlobalCacheDir(allocator: *mem.Allocator) ![]u8 { + if (std.process.getEnvVarOwned(allocator, "ZIG_GLOBAL_CACHE_DIR")) |value| { + if (value.len > 0) { + return value; + } else { + allocator.free(value); + } + } else |_| {} + const appname = "zig"; if (std.Target.current.os.tag != .windows) { diff --git a/src/main.zig b/src/main.zig index 76f957456a..2996125585 100644 --- a/src/main.zig +++ b/src/main.zig @@ -557,7 +557,7 @@ fn buildOutputType( var test_filter: ?[]const u8 = null; var test_name_prefix: ?[]const u8 = null; var override_local_cache_dir: ?[]const u8 = try optionalStringEnvVar(arena, "ZIG_LOCAL_CACHE_DIR"); - var override_global_cache_dir: ?[]const u8 = try optionalStringEnvVar(arena, "ZIG_GLOBAL_CACHE_DIR"); + var override_global_cache_dir: ?[]const u8 = null; var override_lib_dir: ?[]const u8 = try optionalStringEnvVar(arena, "ZIG_LIB_DIR"); var main_pkg_path: ?[]const u8 = null; var clang_preprocessor_mode: Compilation.ClangPreprocessorMode = .no; diff --git a/src/stage1/all_types.hpp b/src/stage1/all_types.hpp index b1d0bd2ce1..9085acd557 100644 --- a/src/stage1/all_types.hpp +++ b/src/stage1/all_types.hpp @@ -2139,10 +2139,6 @@ struct CodeGen { Buf llvm_ir_file_output_path; Buf analysis_json_output_path; Buf docs_output_path; - Buf *cache_dir; - Buf *c_artifact_dir; - const char **libc_include_dir_list; - size_t libc_include_dir_len; Buf *builtin_zig_path; Buf *zig_std_special_dir; // Cannot be overridden; derived from zig_lib_dir. |