| author |  Andrew Kelley <andrew@ziglang.org> 2026-08-04 17:31:16-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2026-08-05 18:43:50+02:00 |
| log | a06534d73a86d44b7170f56c1e4709a5eb18f681 |
| tree | 644abdd4a1fe7acdc3756c73bb10f2a981ccabaa |
| parent | 01e5c1885684609d84c79135e716b33a1c3fd9a1 |
compiler: eliminate ZIG_DEBUG_MAKER
Just use ZIG_DEBUG_CMD the same as the other jit commands. Originally
this was working around a CI issue but that is no longer the case.
ZIG_DEBUG_MAKER is a new env var that didn't make it to any release tag
yet. Let's revert it to keep number of env vars more minimal.3 files changed, 2 insertions(+), 5 deletions(-)
ci/x86_64-linux-debug.sh+1-1
| ... | @@ -44,7 +44,7 @@ ninja install | ... | @@ -44,7 +44,7 @@ ninja install |
| 44 | 44 | ||
| 45 | # Must be done after zig cc is finished. | 45 | # Must be done after zig cc is finished. |
| 46 | export ZIG_LIB_DIR="$PWD/../lib" | 46 | export ZIG_LIB_DIR="$PWD/../lib" |
| 47 | export ZIG_DEBUG_MAKER=1 | 47 | export ZIG_DEBUG_CMD=1 |
| 48 | 48 | ||
| 49 | # simultaneously test building self-hosted without LLVM and with 32-bit arm | 49 | # simultaneously test building self-hosted without LLVM and with 32-bit arm |
| 50 | stage3-debug/bin/zig build \ | 50 | stage3-debug/bin/zig build \ |
lib/std/zig.zig-1
| ... | @@ -767,7 +767,6 @@ pub const EnvVar = enum { | ... | @@ -767,7 +767,6 @@ pub const EnvVar = enum { |
| 767 | ZIG_VERBOSE_CC, | 767 | ZIG_VERBOSE_CC, |
| 768 | ZIG_VERBOSE_CMD, | 768 | ZIG_VERBOSE_CMD, |
| 769 | ZIG_DEBUG_CMD, | 769 | ZIG_DEBUG_CMD, |
| 770 | ZIG_DEBUG_MAKER, | ||
| 771 | ZIG_IS_DETECTING_LIBC_PATHS, | 770 | ZIG_IS_DETECTING_LIBC_PATHS, |
| 772 | ZIG_IS_AVOIDING_CALLING_ITSELF, | 771 | ZIG_IS_AVOIDING_CALLING_ITSELF, |
| 773 | 772 |
src/main.zig+1-3
| ... | @@ -359,7 +359,6 @@ fn mainArgs( | ... | @@ -359,7 +359,6 @@ fn mainArgs( |
| 359 | .prepend_global_cache_path = true, | 359 | .prepend_global_cache_path = true, |
| 360 | .prepend_zig_exe_path = true, | 360 | .prepend_zig_exe_path = true, |
| 361 | .prepend_seed = true, | 361 | .prepend_seed = true, |
| 362 | .debug_env_var = .ZIG_DEBUG_MAKER, | ||
| 363 | .release_mode = .safe, | 362 | .release_mode = .safe, |
| 364 | }); | 363 | }); |
| 365 | }, | 364 | }, |
| ... | @@ -4863,7 +4862,6 @@ const JitCmdOptions = struct { | ... | @@ -4863,7 +4862,6 @@ const JitCmdOptions = struct { |
| 4863 | capture: ?*[]u8 = null, | 4862 | capture: ?*[]u8 = null, |
| 4864 | /// Send error bundles via std.zig.Server over stdout | 4863 | /// Send error bundles via std.zig.Server over stdout |
| 4865 | server: bool = false, | 4864 | server: bool = false, |
| 4866 | debug_env_var: EnvVar = .ZIG_DEBUG_CMD, | ||
| 4867 | release_mode: std.lang.Optimize = .fast, | 4865 | release_mode: std.lang.Optimize = .fast, |
| 4868 | }; | 4866 | }; |
| 4869 | 4867 | ||
| ... | @@ -4915,7 +4913,7 @@ fn jitCmdInner( | ... | @@ -4915,7 +4913,7 @@ fn jitCmdInner( |
| 4915 | const self_exe_path = process.executablePathAlloc(io, arena) catch |err| | 4913 | const self_exe_path = process.executablePathAlloc(io, arena) catch |err| |
| 4916 | fatal("unable to find self exe path: {t}", .{err}); | 4914 | fatal("unable to find self exe path: {t}", .{err}); |
| 4917 | 4915 | ||
| 4918 | const optimize_mode: std.lang.Optimize = if (options.debug_env_var.isSet(environ_map)) | 4916 | const optimize_mode: std.lang.Optimize = if (EnvVar.ZIG_DEBUG_CMD.isSet(environ_map)) |
| 4919 | .debug | 4917 | .debug |
| 4920 | else | 4918 | else |
| 4921 | options.release_mode; | 4919 | options.release_mode; |