From 9badc5485d7483af66568561d0e74012cdb2bc2d Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Fri, 21 Aug 2026 16:40:08 -0400
Subject: [PATCH] Internals: Cleanup code duplication. No functional change
 intended.

---
 src/V3EmitMk.cpp | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/V3EmitMk.cpp b/src/V3EmitMk.cpp
index a63d328f3..891f0b6fd 100644
--- a/src/V3EmitMk.cpp
+++ b/src/V3EmitMk.cpp
@@ -538,39 +538,23 @@ public:
 
         of.puts("\n### Switches...\n");
         of.puts("# C11 constructs required?  0/1 (always on now)\n");
-        of.puts("VM_C11 = 1\n");
+        of.putSet("VM_C11", "1");
         of.puts("# Timing enabled?  0/1\n");
-        of.puts("VM_TIMING = ");
-        of.puts(v3Global.usesTiming() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_TIMING", v3Global.usesTiming() ? "1" : "0");
         of.puts("# Coverage output mode?  0/1 (from --coverage)\n");
-        of.puts("VM_COVERAGE = ");
-        of.puts(v3Global.opt.coverage() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_COVERAGE", v3Global.opt.coverage() ? "1" : "0");
         of.puts("# Parallel builds?  0/1 (from --output-split)\n");
-        of.puts("VM_PARALLEL_BUILDS = ");
-        of.puts(v3Global.useParallelBuild() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_PARALLEL_BUILDS", v3Global.useParallelBuild() ? "1" : "0");
         of.puts("# Tracing output mode?  0/1 (from --trace-fst/--trace-saif/--trace-vcd)\n");
-        of.puts("VM_TRACE = ");
-        of.puts(v3Global.opt.trace() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_TRACE", v3Global.opt.trace() ? "1" : "0");
         of.puts("# Tracing output mode in FST format?  0/1 (from --trace-fst)\n");
-        of.puts("VM_TRACE_FST = ");
-        of.puts(v3Global.opt.traceEnabledFst() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_TRACE_FST", v3Global.opt.traceEnabledFst() ? "1" : "0");
         of.puts("# Tracing output mode in SAIF format?  0/1 (from --trace-saif)\n");
-        of.puts("VM_TRACE_SAIF = ");
-        of.puts(v3Global.opt.traceEnabledSaif() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_TRACE_SAIF", v3Global.opt.traceEnabledSaif() ? "1" : "0");
         of.puts("# Tracing output mode in VCD format?  0/1 (from --trace-vcd)\n");
-        of.puts("VM_TRACE_VCD = ");
-        of.puts(v3Global.opt.traceEnabledVcd() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_TRACE_VCD", v3Global.opt.traceEnabledVcd() ? "1" : "0");
         of.puts("# VPI enabled?  0/1 (from --vpi)\n");
-        of.puts("VM_VPI = ");
-        of.puts(v3Global.opt.vpi() ? "1" : "0");
-        of.puts("\n");
+        of.putSet("VM_VPI", v3Global.opt.vpi() ? "1" : "0");
         // Link flags for runtime VPI library loading are emitted by emitOverallMake() after
         // verilated.mk is included (so $(CFG_LDFLAGS_DYNAMIC)/$(CFG_LDLIBS_DYNAMIC) are defined).
 
@@ -677,7 +661,7 @@ public:
         of.putSet("VM_PCLI", (v3Global.opt.systemC() ? "0" : "1"));
         of.puts(
             "# Deprecated: SystemC architecture to find link library path (from $SYSTEMC_ARCH)\n");
-        of.puts("VM_SC_TARGET_ARCH = "s + V3Options::getenvSYSTEMC_ARCH() + "\n");
+        of.putSet("VM_SC_TARGET_ARCH", V3Options::getenvSYSTEMC_ARCH());
 
         of.puts("\n### Vars...\n");
         of.puts("# Design prefix (from --prefix)\n");