Changeset 97991 in vbox for trunk/tools

Timestamp:

Jan 5, 2023 2:04:12 AM (2 years ago)

Author:

vboxsync

Message:

tools/kBuildTools: Adjusted DEFS quoting here as well, so it matches what kBuild does.

Location:

trunk/tools/kBuildTools

Files:

• VBoxXGccAmd64LinuxGnu.kmk (modified) (3 diffs)
• VBoxXGccX86RedHatLinux.kmk (modified) (3 diffs)
• VBoxXcode62.kmk (modified) (9 diffs)

trunk/tools/kBuildTools/VBoxXGccAmd64LinuxGnu.kmk

@@ -91 +91 @@
 define TOOL_VBoxXGccAmd64LinuxGnu_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VBoxXGccAmd64LinuxGnu_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) \
@@ -102 +102 @@
 define TOOL_VBoxXGccAmd64LinuxGnu_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VBoxXGccAmd64LinuxGnu_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) \
@@ -113 +113 @@
 define TOOL_VBoxXGccAmd64LinuxGnu_COMPILE_AS_CMDS
         $(QUIET)$(TOOL_VBoxXGccAmd64LinuxGnu_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) \

trunk/tools/kBuildTools/VBoxXGccX86RedHatLinux.kmk

@@ -90 +90 @@
 define TOOL_VBoxXGccX86RedHatLinux_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VBoxXGccX86RedHatLinux_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) \
@@ -101 +101 @@
 define TOOL_VBoxXGccX86RedHatLinux_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VBoxXGccX86RedHatLinux_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) \
@@ -112 +112 @@
 define TOOL_VBoxXGccX86RedHatLinux_COMPILE_AS_CMDS
         $(QUIET)$(TOOL_VBoxXGccX86RedHatLinux_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) \

trunk/tools/kBuildTools/VBoxXcode62.kmk

@@ -190 +190 @@
                 --kObjCache-cpp $(outbase).i\
                 $(TOOL_VBoxXcode62_CC) -E -o -\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 $(abspath $(source))\
@@ -204 +204 @@
 define TOOL_VBoxXcode62_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_CC) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 -o $(obj)\
@@ -234 +234 @@
                 --kObjCache-cpp $(outbase).ii\
                 $(TOOL_VBoxXcode62_CXX) -E -o -\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep)\
                 -Wp,-MP\
@@ -249 +249 @@
 define TOOL_VBoxXcode62_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_CXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep)\
                 -Wp,-MP\
@@ -280 +280 @@
                 --kObjCache-cpp $(outbase).ii\
                 $(TOOL_VBoxXcode62_OBJC) -E -o -\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 $(abspath $(source))\
@@ -294 +294 @@
 define TOOL_VBoxXcode62_COMPILE_OBJC_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_OBJC) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 -o $(obj)\
@@ -324 +324 @@
                 --kObjCache-cpp $(outbase).mii\
                 $(TOOL_VBoxXcode62_OBJCXX) -E -o -\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 $(abspath $(source))\
@@ -338 +338 @@
 define TOOL_VBoxXcode62_COMPILE_OBJCXX_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_OBJCXX) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 -o $(obj)\
@@ -365 +365 @@
 define TOOL_VBoxXcode62_COMPILE_AS_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_AS) -c\
-                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MP\
                 -o $(obj)\