diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2021-03-28 19:42:08 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2021-03-28 19:42:43 -0700 |
| commit | 281a7baaeac6b6b3c8c78124f5e484f7ee101cf0 (patch) | |
| tree | a8ca0725a42e8940197064a4e6485e2523b9926b /src/main.zig | |
| parent | 8f469c11275e60f5f1a8ae08fc7596ba366eda16 (diff) | |
| parent | 175adc0bd738c2e3a55bb71c6a53dcc920c203ba (diff) | |
| download | zig-281a7baaeac6b6b3c8c78124f5e484f7ee101cf0.tar.gz zig-281a7baaeac6b6b3c8c78124f5e484f7ee101cf0.zip | |
Merge remote-tracking branch 'origin/master' into zir-memory-layout
Wanted to make sure those new test cases still pass.
Also grab that CI fix so we can get those green check marks.
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.zig b/src/main.zig index 272187a9ed..7d494d5f58 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; |