diff --git a/.gitignore b/.gitignore
index 6fee010..b15196c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ kBuild-0.1.5-p2-src.tar.gz
 /kBuild-r3296.20190122.tar.gz
 /kBuild-r3564.20220308.tar.gz
 /kBuild-r3572.20221024.tar.gz
+/kBuild-r3589.20230220.tar.gz
+/kBuild-r3605.20240424.tar.gz
+/kBuild-r3674.20250422.tar.gz
diff --git a/changeset_3572.diff b/changeset_3572.diff
new file mode 100644
index 0000000..2abf95f
--- /dev/null
+++ b/changeset_3572.diff
@@ -0,0 +1,47 @@
+Index: trunk/Config.kmk
+===================================================================
+--- trunk/Config.kmk	(revision 3571)
++++ trunk/Config.kmk	(revision 3572)
+@@ -124,4 +124,11 @@
+  TOOL_FLEX_LEX = gflex
+ endif
++# Not all compiler tools currently do the same quoting of DEFS, so here's a
++# temporary workaround.
++ifn1of ($(KBUILD_TARGET), win)
++ TMP_QUOTE_SLASH :=
++else
++ TMP_QUOTE_SLASH := \$(NO_SUCH_VARIABLE)
++endif
+ 
+ #
+@@ -183,6 +190,6 @@
+ 
+ DEFS += \
+-	KBUILD_PATH=\"/$(patsubst %/,%,$(MY_INST_DATA))\" \
+-	KBUILD_BIN_PATH=\"/$(patsubst %/,%,$(MY_INST_BIN))\"
++	KBUILD_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_DATA))$(TMP_QUOTE_SLASH)" \
++	KBUILD_BIN_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_BIN))$(TMP_QUOTE_SLASH)"
+ endif
+ 
+Index: trunk/src/kmk/Makefile.kmk
+===================================================================
+--- trunk/src/kmk/Makefile.kmk	(revision 3571)
++++ trunk/src/kmk/Makefile.kmk	(revision 3572)
+@@ -39,5 +39,5 @@
+ 	$(TEMPLATE_BIN_DEFS) \
+ 	KBUILD_SVN_REV=$(KBUILD_SVN_REV) \
+-	KBUILD_TYPE=\"$(KBUILD_TYPE)\"
++	KBUILD_TYPE=$(TMP_QUOTE_SLASH)"$(KBUILD_TYPE)$(TMP_QUOTE_SLASH)"
+ TEMPLATE_BIN-KMK_DEPS = \
+ 	$(kmk_0_OUTDIR)/config.h \
+@@ -235,7 +235,7 @@
+ 	CONFIG_WITH_MEMORY_OPTIMIZATIONS \
+ 	\
+-	KBUILD_HOST=\"$(KBUILD_TARGET)\" \
+-	KBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
+-	KBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\"
++	KBUILD_HOST=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET)$(TMP_QUOTE_SLASH)" \
++	KBUILD_HOST_ARCH=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_ARCH)$(TMP_QUOTE_SLASH)" \
++	KBUILD_HOST_CPU=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_CPU)$(TMP_QUOTE_SLASH)"
+ # kmk_DEFS += CONFIG_WITH_COMPILER  # experimental, doesn't work 101% right it seems.
+ kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS
diff --git a/changeset_trunk_3566.diff b/changeset_trunk_3566.diff
new file mode 100644
index 0000000..d225862
--- /dev/null
+++ b/changeset_trunk_3566.diff
@@ -0,0 +1,761 @@
+Index: trunk/kBuild/header.kmk
+===================================================================
+--- trunk/kBuild/header.kmk	(revision 3565)
++++ trunk/kBuild/header.kmk	(revision 3566)
+@@ -1714,5 +1714,5 @@
+ ##
+ # An internal define used by subheader.kmk, subfooter.kmk, and
+-# KB_FN_PASS_0_ON_TARGET.
++# KB_FN_DO_PASS0_ON_TARGET.
+ #
+ # @param target    The target to process.
+Index: trunk/kBuild/tools/GCC.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC.kmk	(revision 3566)
+@@ -106,5 +106,5 @@
+ define TOOL_GCC_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+@@ -132,5 +132,5 @@
+ define TOOL_GCC_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+@@ -158,5 +158,5 @@
+ define TOOL_GCC_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC3.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC3.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC3.kmk	(revision 3566)
+@@ -138,5 +138,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC3_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -152,5 +152,5 @@
+ define TOOL_GCC3_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC3_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -182,5 +182,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC3_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -196,5 +196,5 @@
+ define TOOL_GCC3_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC3_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -223,5 +223,5 @@
+ define TOOL_GCC3_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC3_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC32.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC32.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC32.kmk	(revision 3566)
+@@ -138,5 +138,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC32_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -152,5 +152,5 @@
+ define TOOL_GCC32_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC32_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -182,5 +182,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC32_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -197,5 +197,5 @@
+ define TOOL_GCC32_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC32_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -224,5 +224,5 @@
+ define TOOL_GCC32_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC32_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC3OMF.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC3OMF.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC3OMF.kmk	(revision 3566)
+@@ -122,5 +122,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC3OMF_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -136,5 +136,5 @@
+ define TOOL_GCC3OMF_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC3OMF_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
+ 		-o $(obj)\
+@@ -167,5 +167,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC3OMF_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -181,5 +181,5 @@
+ define TOOL_GCC3OMF_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC3OMF_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
+ 		-o $(obj)\
+@@ -208,5 +208,5 @@
+ define TOOL_GCC3OMF_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC3OMF_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC3PLAIN.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC3PLAIN.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC3PLAIN.kmk	(revision 3566)
+@@ -123,5 +123,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC3PLAIN_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -137,5 +137,5 @@
+ define TOOL_GCC3PLAIN_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC3PLAIN_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -167,5 +167,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC3PLAIN_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -181,5 +181,5 @@
+ define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -208,5 +208,5 @@
+ define TOOL_GCC3PLAIN_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC3PLAIN_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC42MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC42MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC42MACHO.kmk	(revision 3566)
+@@ -165,5 +165,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC42MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -179,5 +179,5 @@
+ define TOOL_GCC42MACHO_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -209,5 +209,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC42MACHO_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -223,5 +223,5 @@
+ define TOOL_GCC42MACHO_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -253,5 +253,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC42MACHO_OBJC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -267,5 +267,5 @@
+ define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -297,5 +297,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GCC42MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -311,5 +311,5 @@
+ define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -338,5 +338,5 @@
+ define TOOL_GCC42MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC42MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC4MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC4MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC4MACHO.kmk	(revision 3566)
+@@ -165,5 +165,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC4MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -179,5 +179,5 @@
+ define TOOL_GCC4MACHO_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -209,5 +209,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC4MACHO_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -223,5 +223,5 @@
+ define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -253,5 +253,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC4MACHO_OBJC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -267,5 +267,5 @@
+ define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -297,5 +297,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GCC4MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -311,5 +311,5 @@
+ define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -338,5 +338,5 @@
+ define TOOL_GCC4MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC4MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GCC64.kmk
+===================================================================
+--- trunk/kBuild/tools/GCC64.kmk	(revision 3565)
++++ trunk/kBuild/tools/GCC64.kmk	(revision 3566)
+@@ -137,5 +137,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GCC64_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -151,5 +151,5 @@
+ define TOOL_GCC64_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GCC64_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -181,5 +181,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GCC64_CXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -195,5 +195,5 @@
+ define TOOL_GCC64_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GCC64_CXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -222,5 +222,5 @@
+ define TOOL_GCC64_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GCC64_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX.kmk	(revision 3566)
+@@ -121,5 +121,5 @@
+ define TOOL_GXX_COMPILE_C_CMDS
+ 	$(QUIET)$(TOOL_GXX_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+@@ -147,5 +147,5 @@
+ define TOOL_GXX_COMPILE_CXX_CMDS
+ 	$(QUIET)$(TOOL_GXX_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -173,5 +173,5 @@
+ define TOOL_GXX_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -200,5 +200,5 @@
+ define TOOL_GXX_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX3.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX3.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX3.kmk	(revision 3566)
+@@ -148,5 +148,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX3_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -158,5 +158,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -189,5 +189,5 @@
+ 		$(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -199,5 +199,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -226,5 +226,5 @@
+ define TOOL_GXX3_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX3_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -253,5 +253,5 @@
+ define TOOL_GXX3_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX3_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX32.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX32.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX32.kmk	(revision 3566)
+@@ -145,5 +145,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX32_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -155,5 +155,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX32_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -186,5 +186,5 @@
+ 		$(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -196,5 +196,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX32_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -223,5 +223,5 @@
+ define TOOL_GXX32_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX32_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -250,5 +250,5 @@
+ define TOOL_GXX32_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX32_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX3OMF.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX3OMF.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX3OMF.kmk	(revision 3566)
+@@ -134,5 +134,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX3OMF_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -144,5 +144,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3OMF_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -175,5 +175,5 @@
+ 		$(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -185,5 +185,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3OMF_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -212,5 +212,5 @@
+ define TOOL_GXX3OMF_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX3OMF_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -239,5 +239,5 @@
+ define TOOL_GXX3OMF_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX3OMF_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX3PLAIN.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX3PLAIN.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX3PLAIN.kmk	(revision 3566)
+@@ -131,5 +131,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX3PLAIN_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -141,5 +141,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3PLAIN_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -172,5 +172,5 @@
+ 		$(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -182,5 +182,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -209,5 +209,5 @@
+ define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -236,5 +236,5 @@
+ define TOOL_GXX3PLAIN_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX3PLAIN_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX42MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX42MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX42MACHO.kmk	(revision 3566)
+@@ -174,5 +174,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX42MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -184,5 +184,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX42MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -215,5 +215,5 @@
+ 		$(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -225,5 +225,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX42MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -252,5 +252,5 @@
+ define TOOL_GXX42MACHO_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -282,5 +282,5 @@
+ 		--kObjCache-cpp $(outbase).ii\
+ 		$(TOOL_GXX42MACHO_OBJC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -296,5 +296,5 @@
+ define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -326,5 +326,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GXX42MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -340,5 +340,5 @@
+ define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -367,5 +367,5 @@
+ define TOOL_GXX42MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX42MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX4MACHO.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX4MACHO.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX4MACHO.kmk	(revision 3566)
+@@ -174,5 +174,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX4MACHO_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -184,5 +184,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX4MACHO_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -215,5 +215,5 @@
+ 		$(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -225,5 +225,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX4MACHO_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -252,5 +252,5 @@
+ define TOOL_GXX4MACHO_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX4MACHO_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -282,5 +282,5 @@
+ 		--kObjCache-cpp $(outbase).mii\
+ 		$(TOOL_GXX4MACHO_OBJCXX) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -296,5 +296,5 @@
+ define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS
+ 	$(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -323,5 +323,5 @@
+ define TOOL_GXX4MACHO_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX4MACHO_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+Index: trunk/kBuild/tools/GXX64.kmk
+===================================================================
+--- trunk/kBuild/tools/GXX64.kmk	(revision 3565)
++++ trunk/kBuild/tools/GXX64.kmk	(revision 3566)
+@@ -145,5 +145,5 @@
+ 		--kObjCache-cpp $(outbase).i\
+ 		$(TOOL_GXX64_CC) -E -o -\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -155,5 +155,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX64_CC) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -186,5 +186,5 @@
+ 		$(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
+ 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		$(abspath $(source))\
+@@ -196,5 +196,5 @@
+ else
+ 	$(QUIET)$(TOOL_GXX64_CXX) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
+@@ -223,5 +223,5 @@
+ define TOOL_GXX64_COMPILE_PCH_CMDS
+ 	$(QUIET)$(TOOL_GXX64_PCH) -c\
+-		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
+@@ -250,5 +250,5 @@
+ define TOOL_GXX64_COMPILE_AS_CMDS
+ 	$(QUIET)$(TOOL_GXX64_AS) -c\
+-		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
++		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
+ 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
+ 		-o $(obj)\
diff --git a/kBuild-0.1.9998-portme.patch b/kBuild-0.1.9998-portme.patch
index 53b6462..9e490e3 100644
--- a/kBuild-0.1.9998-portme.patch
+++ b/kBuild-0.1.9998-portme.patch
@@ -1,3 +1,9 @@
+# Only used on el6
+# Found the reason why compile fails in detection of powerpc64 in centos 6
+# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
+# hack for gcc < 4.6 and ppc64 only
+# https://stackoverflow.com/a/40675229/778517
+
 --- kBuild/src/lib/kStuff/include/k/kDefs.h.orig	2018-05-12 03:35:13.703342877 +0100
 +++ kBuild/src/lib/kStuff/include/k/kDefs.h	2018-05-12 04:24:52.034917011 +0100
 @@ -336,16 +336,19 @@
diff --git a/kBuild-c23.patch b/kBuild-c23.patch
new file mode 100644
index 0000000..fde7a93
--- /dev/null
+++ b/kBuild-c23.patch
@@ -0,0 +1,14 @@
+diff -Nurp kBuild.orig/src/kmk/glob/fnmatch.c kBuild/src/kmk/glob/fnmatch.c
+--- kBuild.orig/src/kmk/glob/fnmatch.c	2025-04-25 21:54:33.000000000 +0100
++++ kBuild/src/kmk/glob/fnmatch.c	2025-04-25 23:20:55.477680324 +0100
+@@ -120,10 +120,6 @@ USA.  */
+ /* Avoid depending on library functions or files
+    whose names are inconsistent.  */
+ 
+-# if !defined _LIBC && !defined getenv && !defined _MSC_VER
+-extern char *getenv ();
+-# endif
+-
+ # ifndef errno
+ extern int errno;
+ # endif
diff --git a/kBuild.spec b/kBuild.spec
index f6dce7a..b8c234f 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,12 +1,13 @@
-%global svn_revision 3572
-%global svn_date 20221024
+%global svn_revision 3674
+%global svn_date 20250422
 
 Name:           kBuild
 Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        1%{?svn_date:.%{svn_date}}%{?dist}
+Release:        2%{?svn_date:.%{svn_date}}%{?dist}
 Summary:        A cross-platform build environment
 
-License:        BSD and GPLv2+
+# Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
+License:        LicenseRef-Callaway-BSD AND GPL-2.0-or-later
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
@@ -17,6 +18,10 @@ Patch1:         kBuild-pthread.patch
 Patch6:         kbuild-dummy_noreturn.diff
 Patch8:         kBuild-0.1.9998-portme.patch
 Patch10:        assert.patch
+Patch11:        relax_automake_version.patch
+Patch14:        changeset_3572.diff
+Patch15:        changeset_trunk_3566.diff
+Patch16:        kBuild-c23.patch
 
 BuildRequires:  make
 BuildRequires:  gcc
@@ -39,22 +44,30 @@ repository.
 
 
 %prep
-#%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
+%dnl %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
 %setup -q -n %{name}
-%patch0 -p1 -b .escape
-%patch1 -p1 -b .pthreads
-%patch6 -p1 -b .dummy_noreturn
+%patch -P0 -p1 -b .escape
+%patch -P1 -p1 -b .pthreads
+%patch -P6 -p1 -b .dummy_noreturn
 %ifarch ppc64
 %if 0%{?rhel} && 0%{?rhel} < 7
 # Found the reason why compile fails in detection of powerpc64 in centos 6
 # kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
 # hack for gcc < 4.6 and ppc64 only
 # https://stackoverflow.com/a/40675229/778517
-%patch8 -p1 -b .portme
+%patch -P8 -p1 -b .portme
 %endif
 %endif
-%patch10 -p1 -b .portme3
-
+%patch -P10 -p1 -b .portme3
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%patch -P11 -p1
+%endif
+%if 0%{?rhel} && 0%{?rhel} <= 7
+# we need revert this 2 commits to build VBox 6 on el7
+%patch -P14 -p1 -R -b .revert
+%patch -P15 -p1 -R -b .revert2
+%endif
+%patch -P16 -p1
 
 %build
 echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
@@ -98,8 +111,50 @@ pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
 
 
 %changelog
-* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-2.20221024
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3674-2.20250422
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Apr 25 2025 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3674-1.20250422
+- Update to Revision 3674
+- (rhbz#2340684) Fix FTBFS
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-4.20240424
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 0.1.9998.r3605-3.20240424
+- convert license to SPDX
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-2.20240424
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jun 04 2024 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3605-1.20240424
+- Update to Revision 3605
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-5.20230220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-4.20230220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Dec 20 2023 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3589-3.20230220
+- Fix another C compatibility issue (#2154544)
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-2.20230220
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Mar 09 2023 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3589-1.20230220
+- new version
+- revert changeset 3572 and 3566 to build VBox 6 on el7
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3572-3.20221024
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3572-2.20221024
+- C99 compatibility fixes (#2154544)
+
+* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-1.20221024
 - Update to r3572.20221024
+- Allow build with automake 1.13.4 on epel7
 
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3564-2.20220308
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff
index 929dc08..bf03e86 100644
--- a/kbuild-dummy_noreturn.diff
+++ b/kbuild-dummy_noreturn.diff
@@ -11,28 +11,3 @@ Index: src/kmk/kmkbuiltin/expr.c
  	}
  	/* NOTREACHED */
  }
-Index: src/kmk/kmkbuiltin/kbuild_protection.c
-===================================================================
---- ./src/kmk/kmkbuiltin/kbuild_protection.c.orig
-+++ ./src/kmk/kmkbuiltin/kbuild_protection.c
-@@ -29,6 +29,7 @@
- #include "config.h"
- #include <sys/types.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <string.h>
- #include <ctype.h>
- #include <assert.h>
-# Fix one implicit-function-declaration
-Index: src/sed/lib/utils.c
-===================================================================
---- ./src/sed/lib/utils.c	(revision 3127)
-+++ ./src/sed/lib/utils.c	(working copy)
-@@ -19,6 +19,7 @@
- #include "config.h"
- 
- #include <stdio.h>
-+#include <unistd.h>
- 
- #include <errno.h>
- #ifndef errno
diff --git a/relax_automake_version.patch b/relax_automake_version.patch
new file mode 100644
index 0000000..8e6fc2f
--- /dev/null
+++ b/relax_automake_version.patch
@@ -0,0 +1,12 @@
+# Only for epel <= 7
+--- kBuild/src/kmk/configure.ac.orig	2022-10-30 19:36:49.966336934 +0000
++++ kBuild/src/kmk/configure.ac	2022-10-30 19:37:07.936270597 +0000
+@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h])
+ # We cannot enable -Werror because gettext 0.18.1 has invalid content
+ # When we update gettext to 0.18.3 or better we can add it again.
+ # bird: Added subdir-objects
+-AM_INIT_AUTOMAKE([1.15 foreign -Werror -Wall subdir-objects])
++AM_INIT_AUTOMAKE([1.13.4 foreign -Werror -Wall subdir-objects])
+ 
+ # Checks for programs.
+ AC_USE_SYSTEM_EXTENSIONS
diff --git a/sources b/sources
index 5a4c893..7b1bdf3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3572.20221024.tar.gz) = 65f1c7f79c8daa5d4f6f7430f05e05081407ef03009fa8d20f794a450bb4b8ab7ad52a449f3700f2a3effde962a04a8fde6ee6c21db26ce9bdf5640c389ebc57
+SHA512 (kBuild-r3674.20250422.tar.gz) = dfb52548f896281ac7473a2ebed93e939ae65e6b22101f16a27d36367a90304a3b0aa67f5470d50af1a37333865f570cc447ac7537250fc0fe57746d6c6ba219