From 266ffd41334f046d866adba5cf6c0457dbd86240 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 25 Jun 2026 13:40:29 -0700
Subject: [PATCH] Maker: build it in ReleaseSafe mode by default

also, introduce ZIG_VERBOSE_CMD for printing the child argv rather than
repurposing ZIG_DEBUG_CMD because the stderr output can be problematic
---
 lib/std/zig.zig | 1 +
 src/main.zig    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index cf6a1c3eb8131de1c16e4bcd2d227460ab78e52a..4ab3364d6e2e6421ba7ccc66a23d6c5895583341 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -781,6 +781,7 @@ pub const EnvVar = enum {
     ZIG_BUILD_MULTILINE_ERRORS,
     ZIG_VERBOSE_LINK,
     ZIG_VERBOSE_CC,
+    ZIG_VERBOSE_CMD,
     ZIG_DEBUG_CMD,
     ZIG_DEBUG_MAKER,
     ZIG_IS_DETECTING_LIBC_PATHS,
diff --git a/src/main.zig b/src/main.zig
index 39652f0996e5ddc6e69d24e603006eed9646ca80..dbe4c34265ea7cba91200748d35c2cd99df427f8 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -361,6 +361,7 @@ fn mainArgs(
                 .prepend_zig_exe_path = true,
                 .prepend_seed = true,
                 .debug_env_var = .ZIG_DEBUG_MAKER,
+                .release_mode = .ReleaseSafe,
             });
         },
         .clang, .@"-cc1", .@"-cc1as" => {
@@ -4875,6 +4876,7 @@ const JitCmdOptions = struct {
     /// Send error bundles via std.zig.Server over stdout
     server: bool = false,
     debug_env_var: EnvVar = .ZIG_DEBUG_CMD,
+    release_mode: std.lang.OptimizeMode = .ReleaseFast,
 };
 
 fn jitCmd(
@@ -4928,7 +4930,7 @@ fn jitCmdInner(
     const optimize_mode: std.lang.OptimizeMode = if (options.debug_env_var.isSet(environ_map))
         .Debug
     else
-        .ReleaseFast;
+        options.release_mode;
     const strip = optimize_mode != .Debug;
     const override_lib_dir: ?[]const u8 = EnvVar.ZIG_LIB_DIR.get(environ_map);
     const override_global_cache_dir: ?[]const u8 = EnvVar.ZIG_GLOBAL_CACHE_DIR.get(environ_map);
@@ -5064,7 +5066,7 @@ fn jitCmdInner(
 
     child_argv.appendSliceAssumeCapacity(args);
 
-    if (options.debug_env_var.isSet(environ_map)) {
+    if (EnvVar.ZIG_VERBOSE_CMD.isSet(environ_map)) {
         const cmd: std.zig.SubprocessCommand = .{
             .argv = child_argv.items,
         };
-- 
2.54.0