diff --git a/scripts/tint_overrides_with_defaults.gni b/scripts/tint_overrides_with_defaults.gni
index 89a6d22..8ab6c42 100644
--- a/scripts/tint_overrides_with_defaults.gni
+++ b/scripts/tint_overrides_with_defaults.gni
@@ -135,6 +135,11 @@
     tint_build_ir_binary = tint_has_protobuf
   }
 
+  # Build IR binary fuzzer
+  if (!defined(tint_build_ir_fuzzer)) {
+    tint_build_ir_fuzzer = false
+  }
+
   # Build the tintd language server
   if (!defined(tint_build_tintd)) {
     tint_build_tintd = false
@@ -157,10 +162,3 @@
     tint_src_dir = "${tint_root_dir}/src/tint"
   }
 }
-
-declare_args() {
-  # Build IR binary fuzzer
-  if (!defined(tint_build_ir_fuzzer)) {
-    tint_build_ir_fuzzer = tint_has_fuzzers && tint_build_ir_binary
-  }
-}
diff --git a/src/tint/tint.gni b/src/tint/tint.gni
index e660e68..aa56777 100644
--- a/src/tint/tint.gni
+++ b/src/tint/tint.gni
@@ -87,11 +87,13 @@
 }
 
 ###############################################################################
-# Executables
+# Executables - only built when tint_build_cmds is enabled
 ###############################################################################
-template("tint_executable") {
-  executable(target_name) {
-    forward_variables_from(invoker, "*")
+if (tint_build_cmds) {
+  template("tint_executable") {
+    executable(target_name) {
+      forward_variables_from(invoker, "*")
+    }
   }
 }