From a06534d73a86d44b7170f56c1e4709a5eb18f681 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Tue, 4 Aug 2026 17:31:16 -0700
Subject: [PATCH] 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.
---
 ci/x86_64-linux-debug.sh | 2 +-
 lib/std/zig.zig          | 1 -
 src/main.zig             | 4 +---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ci/x86_64-linux-debug.sh b/ci/x86_64-linux-debug.sh
index 0316d3bef37f4058d256c97b62ae0e212160aead..91f6291d90b345139f394f4ee0c26bbe80a5ac57 100755
--- a/ci/x86_64-linux-debug.sh
+++ b/ci/x86_64-linux-debug.sh
@@ -44,7 +44,7 @@ ninja install
 
 # Must be done after zig cc is finished.
 export ZIG_LIB_DIR="$PWD/../lib"
-export ZIG_DEBUG_MAKER=1
+export ZIG_DEBUG_CMD=1
 
 # simultaneously test building self-hosted without LLVM and with 32-bit arm
 stage3-debug/bin/zig build \
diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index 332e0114b02c3cf9747c0d3bba2021eb1b15befd..ec6fc7d630a92133751c8ae481ff193d3fc0dfff 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -767,7 +767,6 @@ pub const EnvVar = enum {
     ZIG_VERBOSE_CC,
     ZIG_VERBOSE_CMD,
     ZIG_DEBUG_CMD,
-    ZIG_DEBUG_MAKER,
     ZIG_IS_DETECTING_LIBC_PATHS,
     ZIG_IS_AVOIDING_CALLING_ITSELF,
 
diff --git a/src/main.zig b/src/main.zig
index ff915761b592ad2a1f9a6fc66336b26e9b43bc16..4ef9537109d9adf1f09048d8e7f28f5aa2780d9b 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -359,7 +359,6 @@ fn mainArgs(
                 .prepend_global_cache_path = true,
                 .prepend_zig_exe_path = true,
                 .prepend_seed = true,
-                .debug_env_var = .ZIG_DEBUG_MAKER,
                 .release_mode = .safe,
             });
         },
@@ -4863,7 +4862,6 @@ const JitCmdOptions = struct {
     capture: ?*[]u8 = null,
     /// Send error bundles via std.zig.Server over stdout
     server: bool = false,
-    debug_env_var: EnvVar = .ZIG_DEBUG_CMD,
     release_mode: std.lang.Optimize = .fast,
 };
 
@@ -4915,7 +4913,7 @@ fn jitCmdInner(
     const self_exe_path = process.executablePathAlloc(io, arena) catch |err|
         fatal("unable to find self exe path: {t}", .{err});
 
-    const optimize_mode: std.lang.Optimize = if (options.debug_env_var.isSet(environ_map))
+    const optimize_mode: std.lang.Optimize = if (EnvVar.ZIG_DEBUG_CMD.isSet(environ_map))
         .debug
     else
         options.release_mode;
-- 
2.54.0