Changeset 3579 in kBuild for trunk/kBuild/tools/CLANGCCMACHO.kmk

Timestamp:

Jan 5, 2023 1:53:41 AM (2 years ago)

Author:

bird

Message:

tools/CLANG*,tools/LLVM*,tools/XGCCAMD64LINUX.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/CLANGCCMACHO.kmk (modified) (8 diffs)

trunk/kBuild/tools/CLANGCCMACHO.kmk

@@ -179 +179 @@
                 --kObjCache-cpp $(outbase).i\
                 $(TOOL_CLANGCCMACHO_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))\
@@ -189 +189 @@
 else
         $(QUIET)$(TOOL_CLANGCCMACHO_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)\
@@ -220 +220 @@
                 $(TOOL_CLANGCCMACHO_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))\
@@ -287 +287 @@
                 --kObjCache-cpp $(outbase).ii\
                 $(TOOL_CLANGCCMACHO_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))\
@@ -301 +301 @@
 define TOOL_CLANGCCMACHO_COMPILE_OBJC_CMDS
         $(QUIET)$(TOOL_CLANGCCMACHO_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)\
@@ -331 +331 @@
                 --kObjCache-cpp $(outbase).mii\
                 $(TOOL_CLANGCCMACHO_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))\
@@ -345 +345 @@
 define TOOL_CLANGCCMACHO_COMPILE_OBJCXX_CMDS
         $(QUIET)$(TOOL_CLANGCCMACHO_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)\
@@ -372 +372 @@
 define TOOL_CLANGCCMACHO_COMPILE_AS_CMDS
         $(QUIET)$(TOOL_CLANGCCMACHO_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)\