Changeset 98162 in vbox for trunk

Timestamp:

Jan 20, 2023 3:47:44 PM (2 years ago)

Author:

vboxsync

Message:

/Config.kmk,++: Extpack build fixes. bugref:10348

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -6682 +6682 @@
 TEMPLATE_VBoxR3StaticNoCrt               = Static
 TEMPLATE_VBoxR3StaticNoCrt_EXTENDS       = VBoxR3Static
-TEMPLATE_VBoxR3StaticNoCrt_SDKS          = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS)))
+TEMPLATE_VBoxR3StaticNoCrt_SDKS          = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(TEMPLATE_VBoxR3Static_SDKS))
+TEMPLATE_VBoxR3StaticNoCrt_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
 TEMPLATE_VBoxR3StaticNoCrt_DEFS          = $(TEMPLATE_VBoxR3Static_DEFS) \
         RT_NO_CRT \
@@ -6906 +6907 @@
 TEMPLATE_VBOXR3AUTOTST  = VBox Ring 3 Testcase Exe
 TEMPLATE_VBOXR3AUTOTST_EXTENDS    := VBoxR3Static
-TEMPLATE_VBOXR3AUTOTST_SDKS        = $(filter-out VBOX_OPENSSL,$(TEMPLATE_$(TEMPLATE_VBOXR3AUTOTST_EXTENDS)_SDKS))
+TEMPLATE_VBOXR3AUTOTST_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBOX_OPENSSL,$(TEMPLATE_$(TEMPLATE_VBOXR3AUTOTST_EXTENDS)_SDKS.$(KBUILD_TARGET_ARCH)))
 ifeq ($(KBUILD_TARGET),win)
  if "$(KBUILD_HOST_VERSION)" vlt "10.0.0.0.10240"  # The windows ASAN requires windows 10 APIs to work.
@@ -8198 +8199 @@
  TEMPLATE_VBoxNLS_SOURCES  = \
         $(PATH_ROOT)/src/VBox/Main/nls/dummy.c
- TEMPLATE_VBoxNLS_SDKS      = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS))
+ TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH)  = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
  ifdef VBOX_WITH_NOCRT_STATIC
   TEMPLATE_VBoxNLS_LIBS.$(KBUILD_TARGET_ARCH) = $(filter-out \
@@ -8803 +8804 @@
 TEMPLATE_VBoxGuestR3NoCrtExe                := ...
 TEMPLATE_VBoxGuestR3NoCrtExe_EXTENDS        := VBoxGuestR3Exe
-TEMPLATE_VBoxGuestR3NoCrtExe_SDKS            = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxGuestR3Exe_SDKS)))
+TEMPLATE_VBoxGuestR3NoCrtExe_SDKS            = $(subst WINSDK10-UCRT-STATIC,WINSDK10-UCRT-INCS, $(TEMPLATE_VBoxGuestR3Exe_SDKS))
+TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBOX_OPENSSL,$(TEMPLATE_VBoxGuestR3Exe_SDKS.$(KBUILD_TARGET_ARCH)))
 TEMPLATE_VBoxGuestR3NoCrtExe_DEFS            = $(TEMPLATE_VBoxGuestR3Exe_DEFS) \
         RT_NO_CRT \