Changeset 96525 in vbox

Timestamp:

Aug 26, 2022 10:08:36 PM (3 years ago)

Author:

vboxsync

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

153390

Message:

/Config.kmk,IPRT/Makefile.kmk: We need a RuntimR3NoAsan.lib for asan builds on Windows, so the VBoxR3StaticExeNoAsan and VBoxR3StaticDllNoAsan templates can use IPRT. The former is necessary for VBOXR3AUTOTST on older hosts, and the latter for the installer components in no-CRT mode. bugref:10261

Location:

trunk

Files:

• Config.kmk (modified) (7 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2170 +2170 @@
  LIB_VMMRC         :=
 endif
-VBOX_LIB_SUPHARDENED    = $(PATH_STAGE_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)
-VBOX_LIB_RUNTIME_STATIC = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
+VBOX_LIB_SUPHARDENED            = $(PATH_STAGE_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)
+VBOX_LIB_RUNTIME_STATIC         = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
+if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "asan"
+VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(PATH_STAGE_LIB)/RuntimeR3NoAsan$(VBOX_SUFF_LIB)
+else
+VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(VBOX_LIB_RUNTIME_STATIC)
+endif
 
 ifndef VBOX_WITH_REM
@@ -6461 +6466 @@
 #
 # A no-ASAN version of VBoxR3Static for things like that automatically executed tests.
-# Note! No IPRT here as we do not build a non-ASAN static IPRT library.
 #
 TEMPLATE_VBoxR3StaticExeNoAsan = VBoxR3Static but w/o ASAN
@@ -6472 +6476 @@
  TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.x86   = $(filter-out %clang_rt.asan-i386.lib   %clang_rt.asan_cxx-i386.lib  , $(TEMPLATE_VBoxR3Static_LIBS.x86))
  TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.amd64 = $(filter-out %clang_rt.asan-x86_64.lib %clang_rt.asan_cxx-x86_64.lib, $(TEMPLATE_VBoxR3Static_LIBS.amd64))
-endif
-TEMPLATE_VBoxR3StaticExeNoAsan_LIBS        = $(filter-out $(VBOX_LIB_RUNTIME_STATIC)   , $(TEMPLATE_VBoxR3Static_LIBS))
+ TEMPLATE_VBoxR3StaticExeNoAsan_LIBS       = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN), $(TEMPLATE_VBoxR3Static_LIBS))
+endif
 
 #
@@ -6488 +6492 @@
 #
 # A no-ASAN version of VBoxR3StaticDll for the installer helper DLL.
-# Note! No IPRT here as we do not build a non-ASAN static IPRT library.
 #
 TEMPLATE_VBoxR3StaticDllNoAsan = VBoxR3StaticDll but w/o ASAN
@@ -6499 +6502 @@
  TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.x86   = $(filter-out %clang_rt.asan_dll_thunk-i386.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.x86))
  TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.amd64 = $(filter-out %clang_rt.asan_dll_thunk-x86_64.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.amd64))
-endif
-TEMPLATE_VBoxR3StaticDllNoAsan_LIBS        = $(filter-out $(VBOX_LIB_RUNTIME_STATIC)   , $(TEMPLATE_VBoxR3StaticDll_LIBS))
+ TEMPLATE_VBoxR3StaticDllNoAsan_LIBS       = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN), $(TEMPLATE_VBoxR3StaticDll_LIBS))
+endif
 
 
@@ -6774 +6777 @@
 #
 TEMPLATE_VBOXR3AUTOTST  = VBox Ring 3 Testcase Exe
-TEMPLATE_VBOXR3AUTOTST_EXTENDS     = VBoxR3Static
+TEMPLATE_VBOXR3AUTOTST_EXTENDS    := VBoxR3Static
 TEMPLATE_VBOXR3AUTOTST_SDKS        = $(filter-out VBOX_OPENSSL,$(TEMPLATE_$(TEMPLATE_VBOXR3AUTOTST_EXTENDS)_SDKS))
 ifeq ($(KBUILD_TARGET),win)
  if "$(KBUILD_HOST_VERSION)" vlt "10.0.0.0.10240"  # The windows ASAN requires windows 10 APIs to work.
-  TEMPLATE_VBOXR3AUTOTST_EXTENDS   = VBoxR3StaticExeNoAsan
+  TEMPLATE_VBOXR3AUTOTST_EXTENDS  := VBoxR3StaticExeNoAsan
  endif
  ifdef VBOX_SIGNING_MODE
@@ -6786 +6789 @@
 endif
 TEMPLATE_VBOXR3AUTOTST_INST        = $(INST_TESTCASE)
+TEMPLATE_VBOXR3AUTOTST_LIBS        = $(filter-out \
+        $(if-expr !defined(SDK_VBOX_LIBXML2_LIBS),$(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB),) \
+        $(if-expr "$(KBUILD_TARGET)" == "win" || "$(KBUILD_TARGET)" == "os2" \
+                ,$(SDK_VBOX_LZF_STATIC_LIBS) $(SDK_VBOX_ZLIB_STATIC_LIBS) \
+               ,$(SDK_VBOX_LZF_LIBS) $(SDK_VBOX_ZLIB_LIBS)) \
+        ,$(TEMPLATE_$(TEMPLATE_VBOXR3AUTOTST_EXTENDS)_LIBS))
 
 #

trunk/src/VBox/Runtime/Makefile.kmk

@@ -129 +129 @@
  ifndef VBOX_WITH_NOCRT_STATIC
   LIBRARIES.win.x86 += RuntimeR3VccTricks
+ endif
+ ifneq ($(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN))
+  LIBRARIES += RuntimeR3NoAsan
  endif
  DLLS += VBoxRT
@@ -2167 +2170 @@
 
 #
+# RuntimeR3NoAsan - A RuntimeR3 version without ASAN for windows hosts.
+#
+RuntimeR3NoAsan_EXTENDS       := RuntimeR3
+RuntimeR3NoAsan_TEMPLATE      := VBoxR3StaticExeNoAsan
+
+
+#
 # RuntimeBldProg - Static Runtime for build programs.
 #