Changeset 98443 in vbox for trunk

Timestamp:

Feb 2, 2023 1:03:05 PM (2 years ago)

Author:

vboxsync

Message:

tools/*.kmk: Automatic scm cleanups. bugref:10348

Location:

trunk/tools

Files:

• kBuildTools/VBoxXGccAmd64LinuxGnu.kmk (modified) (2 diffs)
• kBuildTools/VBoxXGccX86RedHatLinux.kmk (modified) (1 diff)
• kBuildTools/VBoxXcode62.kmk (modified) (18 diffs)
• kBuildUnits/vboximportchecker.kmk (modified) (1 diff)

trunk/tools/kBuildTools/VBoxXGccAmd64LinuxGnu.kmk

@@ -35 +35 @@
  PATH_TOOL_VBoxXGccAmd64LinuxGnu := $(lastword $(wildcard $(KBUILD_DEVTOOLS_HST)/x86_64-linux-gnu/*))
  ifeq ($(PATH_TOOL_VBoxXGccAmd64LinuxGnu),)
-   PATH_TOOL_VBoxXGccAmd64LinuxGnu := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/x86_64-linux-gnu/*)))
+  PATH_TOOL_VBoxXGccAmd64LinuxGnu := $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/x86_64-linux-gnu/*)))
  endif
 endif
@@ -54 +54 @@
 
 ifdef SLKRUNS
-TOOL_VBoxXGccAmd64LinuxGnu_CC  += -fmessage-length=0
-TOOL_VBoxXGccAmd64LinuxGnu_CXX += -fmessage-length=0
+ TOOL_VBoxXGccAmd64LinuxGnu_CC  += -fmessage-length=0
+ TOOL_VBoxXGccAmd64LinuxGnu_CXX += -fmessage-length=0
 endif
 

trunk/tools/kBuildTools/VBoxXGccX86RedHatLinux.kmk

@@ -54 +54 @@
 
 ifdef SLKRUNS
-TOOL_VBoxXGccX86RedHatLinux_CC  += -fmessage-length=0
-TOOL_VBoxXGccX86RedHatLinux_CXX += -fmessage-length=0
+ TOOL_VBoxXGccX86RedHatLinux_CC  += -fmessage-length=0
+ TOOL_VBoxXGccX86RedHatLinux_CXX += -fmessage-length=0
 endif
 

trunk/tools/kBuildTools/VBoxXcode62.kmk

@@ -68 +68 @@
 TOOL_VBoxXcode62_LD_SYSMOD ?= $(PATH_TOOL_VBoxXcode62_TOOLCHAIN_BIN_SLASH)clang++$(HOSTSUFF_EXE)
 ifndef TOOL_VBoxXcode62_LDFLAGS.$(KBUILD_TARGET)
-TOOL_VBoxXcode62_LDFLAGS.dll ?= -dynamiclib
+ TOOL_VBoxXcode62_LDFLAGS.dll ?= -dynamiclib
 else
-TOOL_VBoxXcode62_LDFLAGS.dll ?= $(TOOL_VBoxXcode62_LDFLAGS.$(KBUILD_TARGET))
+ TOOL_VBoxXcode62_LDFLAGS.dll ?= $(TOOL_VBoxXcode62_LDFLAGS.$(KBUILD_TARGET))
 endif
 TOOL_VBoxXcode62_LDFLAGS.sysmod ?= -r
@@ -76 +76 @@
 
 ifdef SLKRUNS
-TOOL_VBoxXcode62_CC     += -fmessage-length=0
-TOOL_VBoxXcode62_CXX    += -fmessage-length=0
-TOOL_VBoxXcode62_OBJC   += -fmessage-length=0
-TOOL_VBoxXcode62_OBJCXX += -fmessage-length=0
+ TOOL_VBoxXcode62_CC     += -fmessage-length=0
+ TOOL_VBoxXcode62_CXX    += -fmessage-length=0
+ TOOL_VBoxXcode62_OBJC   += -fmessage-length=0
+ TOOL_VBoxXcode62_OBJCXX += -fmessage-length=0
 endif
 
@@ -86 +86 @@
         -E 'DEVELOPER_DIR=$(PATH_TOOL_VBoxXcode62)' \
         -E 'PATH=$(PATH_TOOL_VBoxXcode62)/usr/bin/:$(PATH_TOOL_VBoxXcode62)/Toolchains/XcodeDefault.xctoolchain/usr/bin:$(PATH)' \
-       --
+        --
 TOOL_VBoxXcode62_ENV_SETUP_EXT ?= $(REDIRECT_EXT) \
         -E 'DEVELOPER_DIR=$(PATH_TOOL_VBoxXcode62)' \
         -E 'PATH=$(PATH_TOOL_VBoxXcode62)/usr/bin/:$(PATH_TOOL_VBoxXcode62)/Toolchains/XcodeDefault.xctoolchain/usr/bin:$(PATH)' \
-       --
+        --
 
 # General Properties used by kBuild
@@ -112 +112 @@
 TOOL_VBoxXcode62_OBJCFLAGS        ?=
 TOOL_VBoxXcode62_OBJCFLAGS.debug  ?= -g
-TOOL_VBoxXcode62_OBJCFLAGS.profile?= -O2 #-g -pg
-TOOL_VBoxXcode62_OBJCFLAGS.release?= -O2
+TOOL_VBoxXcode62_OBJCFLAGS.profile ?= -O2 #-g -pg
+TOOL_VBoxXcode62_OBJCFLAGS.release ?= -O2
 TOOL_VBoxXcode62_OBJCINCS         ?=
 TOOL_VBoxXcode62_OBJCDEFS         ?=
@@ -148 +148 @@
 # @param    2           The output filename sans suffix.
 TOOL_VBoxXcode62_DEBUG_BUNDLE_FN = \
-    $(1).dSYM/Contents/Info.plist \
-    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))
+        $(1).dSYM/Contents/Info.plist \
+        $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))
 
 ##
@@ -159 +159 @@
 #           does not care and only check for a symbol file in the DWARF
 #           directory with the same name as the debugged module.
-TOOL_VBoxXcode62_DEBUG_INSTALL_FN= \
-    $(3).dSYM/ \
-    $(3).dSYM/Contents/ \
-    $(3).dSYM/Contents/Resources/ \
-    $(3).dSYM/Contents/Resources/DWARF/ \
-    $(1).dSYM/Contents/Info.plist=>$(3).dSYM/Contents/Info.plist \
-    $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))=>$(3).dSYM/Contents/Resources/DWARF/$(notdir $(3))
+TOOL_VBoxXcode62_DEBUG_INSTALL_FN = \
+        $(3).dSYM/ \
+        $(3).dSYM/Contents/ \
+        $(3).dSYM/Contents/Resources/ \
+        $(3).dSYM/Contents/Resources/DWARF/ \
+        $(1).dSYM/Contents/Info.plist=>$(3).dSYM/Contents/Info.plist \
+        $(1).dSYM/Contents/Resources/DWARF/$(notdir $(1))=>$(3).dSYM/Contents/Resources/DWARF/$(notdir $(3))
 
 
@@ -184 +184 @@
 TOOL_VBoxXcode62_COMPILE_C_DEPORD =
 ifdef KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_C_USES_KOBJCACHE = 1
-TOOL_VBoxXcode62_COMPILE_C_OUTPUT = $(outbase).i
-define TOOL_VBoxXcode62_COMPILE_C_CMDS
+ TOOL_VBoxXcode62_COMPILE_C_USES_KOBJCACHE = 1
+ TOOL_VBoxXcode62_COMPILE_C_OUTPUT = $(outbase).i
+ define TOOL_VBoxXcode62_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).i\
@@ -199 +199 @@
                 -
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 else  # !KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_C_OUTPUT =
-define TOOL_VBoxXcode62_COMPILE_C_CMDS
+ TOOL_VBoxXcode62_COMPILE_C_OUTPUT =
+ define TOOL_VBoxXcode62_COMPILE_C_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_CC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -209 +209 @@
                 $(abspath $(source))
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 endif # !KUSE_OBJCACHE
 
@@ -228 +228 @@
 TOOL_VBoxXcode62_COMPILE_CXX_DEPORD =
 ifdef KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_CXX_USES_KOBJCACHE = 1
-TOOL_VBoxXcode62_COMPILE_CXX_OUTPUT = $(outbase).ii
-define TOOL_VBoxXcode62_COMPILE_CXX_CMDS
+ TOOL_VBoxXcode62_COMPILE_CXX_USES_KOBJCACHE = 1
+ TOOL_VBoxXcode62_COMPILE_CXX_OUTPUT = $(outbase).ii
+ define TOOL_VBoxXcode62_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).ii\
@@ -244 +244 @@
                 -
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 else  # !KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_CXX_OUTPUT =
-define TOOL_VBoxXcode62_COMPILE_CXX_CMDS
+ TOOL_VBoxXcode62_COMPILE_CXX_OUTPUT =
+ define TOOL_VBoxXcode62_COMPILE_CXX_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_CXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -255 +255 @@
                 $(abspath $(source))
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 endif # !KBUILD_USE_KOBJCACHE
 
@@ -274 +274 @@
 TOOL_VBoxXcode62_COMPILE_OBJC_DEPORD =
 ifdef KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_OBJC_USES_KOBJCACHE = 1
-TOOL_VBoxXcode62_COMPILE_OBJC_OUTPUT = $(outbase).mi
-define TOOL_VBoxXcode62_COMPILE_OBJC_CMDS
+ TOOL_VBoxXcode62_COMPILE_OBJC_USES_KOBJCACHE = 1
+ TOOL_VBoxXcode62_COMPILE_OBJC_OUTPUT = $(outbase).mi
+ define TOOL_VBoxXcode62_COMPILE_OBJC_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).ii\
@@ -289 +289 @@
                 -
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 else  # !KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_OBJC_OUTPUT =
-define TOOL_VBoxXcode62_COMPILE_OBJC_CMDS
+ TOOL_VBoxXcode62_COMPILE_OBJC_OUTPUT =
+ define TOOL_VBoxXcode62_COMPILE_OBJC_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_OBJC) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -299 +299 @@
                 $(abspath $(source))
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 endif # !KBUILD_USE_KOBJCACHE
 
@@ -318 +318 @@
 TOOL_VBoxXcode62_COMPILE_OBJCXX_DEPORD =
 ifdef KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_OBJCXX_USES_KOBJCACHE = 1
-TOOL_VBoxXcode62_COMPILE_OBJCXX_OUTPUT = $(outbase).mii
-define TOOL_VBoxXcode62_COMPILE_OBJCXX_CMDS
+ TOOL_VBoxXcode62_COMPILE_OBJCXX_USES_KOBJCACHE = 1
+ TOOL_VBoxXcode62_COMPILE_OBJCXX_OUTPUT = $(outbase).mii
+ define TOOL_VBoxXcode62_COMPILE_OBJCXX_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(KOBJCACHE) -f $(outbase).koc -d $(PATH_OBJCACHE) -t $(bld_trg).$(bld_trg_arch) -p\
                 --kObjCache-cpp $(outbase).mii\
@@ -333 +333 @@
                 -
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 else  # !KBUILD_USE_KOBJCACHE
-TOOL_VBoxXcode62_COMPILE_OBJCXX_OUTPUT =
-define TOOL_VBoxXcode62_COMPILE_OBJCXX_CMDS
+ TOOL_VBoxXcode62_COMPILE_OBJCXX_OUTPUT =
+ define TOOL_VBoxXcode62_COMPILE_OBJCXX_CMDS
         $(QUIET)$(TOOL_VBoxXcode62_ENV_SETUP) $(TOOL_VBoxXcode62_OBJCXX) -c\
                 $(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
@@ -343 +343 @@
                 $(abspath $(source))
         %$(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
-endef
+ endef
 endif # !KBUILD_USE_KOBJCACHE
 

trunk/tools/kBuildUnits/vboximportchecker.kmk

@@ -37 +37 @@
 # Helper for expanding certain variables while assigning.
 define def_unit_vboximportchecker_internal_expand_twice
-$(target)_POST_CMDS += $$(if-expr "$$(tool_do)" != "LINK_LIBRARY",$$(NLTAB)$$(VBOX_RTLDRCHECKIMPORTS) -q -p "$$(KBUILD_DEVTOOLS)/$(bld_trg).$(bld_trg_arch)/exports/$$($(target)_2_VBOX_IMPORT_CHECKER)" $$(out),)
+ $(target)_POST_CMDS += $$(if-expr "$$(tool_do)" != "LINK_LIBRARY",$$(NLTAB)$$(VBOX_RTLDRCHECKIMPORTS) -q -p "$$(KBUILD_DEVTOOLS)/$(bld_trg).$(bld_trg_arch)/exports/$$($(target)_2_VBOX_IMPORT_CHECKER)" $$(out),)
 endef
 
 define def_unit_vboximportchecker_target_pre
-# Do not apply to ASAN builds as it requires newere DLLs.
-ifneq ($(KBUILD_TYPE),asan)
+ # Do not apply to ASAN builds as it requires newere DLLs.
+ ifneq ($(KBUILD_TYPE),asan)
 
-# Set pass 2 variable (simpler) and act on it.
- $(target)_2_VBOX_IMPORT_CHECKER := $(evalcall def_fn_prop_get_first_defined,VBOX_IMPORT_CHECKER)
- ifdef $(target)_2_VBOX_IMPORT_CHECKER
-  $(target)_LNK_ORDERDEPS += $(VBOX_RTLDRCHECKIMPORTS)
-  $(eval $(def_unit_vboximportchecker_internal_expand_twice))
+  # Set pass 2 variable (simpler) and act on it.
+  $(target)_2_VBOX_IMPORT_CHECKER := $(evalcall def_fn_prop_get_first_defined,VBOX_IMPORT_CHECKER)
+  ifdef $(target)_2_VBOX_IMPORT_CHECKER
+   $(target)_LNK_ORDERDEPS += $(VBOX_RTLDRCHECKIMPORTS)
+   $(eval $(def_unit_vboximportchecker_internal_expand_twice))
+  endif
+
  endif
-
-endif
 
 endef