Changeset 3566 for trunk/kBuild/tools/GXX64.kmk

Timestamp:

Jun 13, 2022, 5:37:08 PM (3 years ago)

Author:

bird

Message:

tools/G*.kmk,header.kmk: Use qaddprefix in sh-mode for -D and -I processing, just like VCC14*.kmk does. Forced update of header.kmk so KMK_REVISION can be used to detect the changes.

File:

• trunk/kBuild/tools/GXX64.kmk (modified) (6 diffs)

trunk/kBuild/tools/GXX64.kmk

@@ -145 +145 @@
                 --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 +155 @@
 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 +186 @@
                 $(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 +196 @@
 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 +223 @@
 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 +250 @@
 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)\