Changeset 94861 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 5, 2022 5:08:34 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151261

Message:

Validation Kit: Moved TEMPLATE_VBOXVALIDATIONKITR3BASE to main Config.kmk and derive TEMPLATE_VBOXR3TSTEXE_VALKIT from it instead of TEMPLATE_VBoxR3Static. That way it's easier to maintain and not forgotten when we need to do more widespread changes (e.g. see r151253). bugref:​10195

File:

• trunk/src/VBox/ValidationKit/Config.kmk (modified) (3 diffs)

trunk/src/VBox/ValidationKit/Config.kmk

@@ -39 +39 @@
 
 #
-# Base template that drops the -static flag since we only want to use the
-# static version of our own libraries and not the system libs.
-#
-TEMPLATE_VBoxValidationKitR3Base = VBox Validation Kit ring-3 program base, both guest and host.
-TEMPLATE_VBoxValidationKitR3Base_EXTENDS = VBoxR3Static
-ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBoxValidationKitR3Base_LDFLAGS         = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Static_LDFLAGS))
-else ifn1of ($(KBUILD_TARGET), darwin solaris win)
- TEMPLATE_VBoxValidationKitR3Base_CFLAGS          = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CFLAGS))
- TEMPLATE_VBoxValidationKitR3Base_CXXFLAGS        = $(filter-out -static, $(TEMPLATE_VBoxR3Static_CXXFLAGS))
- TEMPLATE_VBoxValidationKitR3Base_OBJCFLAGS       = $(filter-out -static, $(TEMPLATE_VBoxR3Static_OBJCFLAGS))
- TEMPLATE_VBoxValidationKitR3Base_LDFLAGS         = $(filter-out -static, $(TEMPLATE_VBoxR3Static_LDFLAGS))
-endif
-TEMPLATE_VBoxValidationKitR3Base_DEFS = $(filter-out VBOX_WITH_DTRACE,$(TEMPLATE_VBoxR3Static_DEFS))
-TEMPLATE_VBoxValidationKitR3Base_LIBS = $(TEMPLATE_VBoxR3Static_LIBS)
-if1of ($(KBUILD_TARGET), linux)
- if $(VBOX_GCC_VERSION_CXX) < 40800
-  TEMPLATE_VBoxValidationKitR3Base_LIBS += supc++
-  TEMPLATE_VBoxValidationKitR3Base_LDTOOL = $(subst GXX,GCC,$(TEMPLATE_VBoxR3Static_TOOL))
- endif
-endif
-TEMPLATE_VBoxValidationKitR3Base_LDFLAGS.darwin = $(TEMPLATE_VBoxR3Static_LDFLAGS.darwin) -framework IOKit
-
-#
-# Template for building ring-3 progams for the Validation Kit.
+# Template for building ring-3 programs for the Validation Kit.
 # These programs can run on any host or guest.
 #
 TEMPLATE_VBoxValidationKitR3 = VBox Validation Kit ring-3 program, both guest and host.
-TEMPLATE_VBoxValidationKitR3_EXTENDS = VBoxValidationKitR3Base
+TEMPLATE_VBoxValidationKitR3_EXTENDS = VBOXVALIDATIONKITR3BASE
 TEMPLATE_VBoxValidationKitR3_EXTENDS_BY = appending
 TEMPLATE_VBoxValidationKitR3_INST = $(INST_VALIDATIONKIT)$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)/
@@ -102 +78 @@
         -Section:.bss,RW!K
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
- TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBoxValidationKitR3Base_POST_CMDS)$$(NLTAB)
+ TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBOXVALIDATIONKITR3BASE_POST_CMDS)$$(NLTAB)
 endif
 TEMPLATE_VBoxValidationKitR3_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
@@ -225 +201 @@
 endef
 endif
-