From c43d4417e7aa2918bdc260755928058c259441c5 Mon Sep 17 00:00:00 2001
From: Teknomancer <v.ramshankar@gmail.com>
Date: Fri, 17 Jul 2026 11:15:07 +0530
Subject: [PATCH 1/2] Config.kmk: Handle hyphens in username when for
 DEBUG_<username> and DEBUG_USERNAME=<username>.

---
 Config.kmk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.kmk b/Config.kmk
index 84f392fb43e..3165e7e38d6 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -2054,7 +2054,7 @@ ASTOOL := $(VBOX_ASTOOL)
 #
 INCS += $(PATH_ROOT)/include $(PATH_OUT)
 DEFS += VBOX
-DEFS.debug      := DEBUG DEBUG_$(subst $(subst _, ,_),_,$(USERNAME)) DEBUG_USERNAME=$(subst $(subst _, ,_),_,$(USERNAME))
+DEFS.debug      := DEBUG DEBUG_$(subst -,_,$(subst  ,_,$(USERNAME))) DEBUG_USERNAME=$(subst -,_,$(subst  ,_,$(USERNAME)))
 DEFS.dbgopt      = $(DEFS.debug)
 DEFS.profile     = VBOX_WITH_STATISTICS
 DEFS.strict      = RT_STRICT VBOX_STRICT

From 1f14329e00cece3f949edf0c94184c581af426d6 Mon Sep 17 00:00:00 2001
From: Teknomancer <v.ramshankar@gmail.com>
Date: Thu, 23 Jul 2026 09:09:39 +0530
Subject: [PATCH 2/2] Config.kmk: Replace both spaces and hyphens in user name
 when passing to the compiler command-line.

---
 Config.kmk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Config.kmk b/Config.kmk
index 3165e7e38d6..08ab772ba59 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -2054,7 +2054,8 @@ ASTOOL := $(VBOX_ASTOOL)
 #
 INCS += $(PATH_ROOT)/include $(PATH_OUT)
 DEFS += VBOX
-DEFS.debug      := DEBUG DEBUG_$(subst -,_,$(subst  ,_,$(USERNAME))) DEBUG_USERNAME=$(subst -,_,$(subst  ,_,$(USERNAME)))
+USERNAME_FIXUP  := $(subst -,_,$(subst $(subst _, ,_),_,$(USERNAME)))
+DEFS.debug      := DEBUG DEBUG_$(USERNAME_FIXUP) DEBUG_USERNAME=$(USERNAME_FIXUP)
 DEFS.dbgopt      = $(DEFS.debug)
 DEFS.profile     = VBOX_WITH_STATISTICS
 DEFS.strict      = RT_STRICT VBOX_STRICT