Changeset 93341 in vbox

Timestamp:

Jan 19, 2022 10:53:38 AM (3 years ago)

Author:

vboxsync

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

149416

Message:

/Config.kmk,HostDrivers,Installer/win: Added a VBoxR3StaticDllNoAsan template variation to make the installer work better for ASAN builds. bugref:8489 bugref:9841

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• src/VBox/HostDrivers/win/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/win/InstallHelper/Makefile.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -6258 +6258 @@
 
 #
+# 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
+TEMPLATE_VBoxR3StaticDllNoAsan_EXTENDS     = VBoxR3StaticDll
+TEMPLATE_VBoxR3StaticDllNoAsan_CFLAGS      = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CFLAGS))
+TEMPLATE_VBoxR3StaticDllNoAsan_CXXFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CXXFLAGS))
+TEMPLATE_VBoxR3StaticDllNoAsan_PCHFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_PCHFLAGS))
+TEMPLATE_VBoxR3StaticDllNoAsan_LDFLAGS     = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3StaticDll_LDFLAGS))
+TEMPLATE_VBoxR3StaticDllNoAsan_LIBS        = $(filter-out $(VBOX_LIB_RUNTIME_STATIC)   , $(TEMPLATE_VBoxR3StaticDll_LIBS))
+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))
+
+#
 # Non-pedantic variation of VBoxR3Static
 #

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -229 +229 @@
 
  #
- # WinNetConfig - static library with host network interface config API
+ # WinNetConfig - static library with host network interface config API (for the installer)
  #
  LIBRARIES.win += WinNetConfig
- WinNetConfig_TEMPLATE = VBOXR3STATIC
+ WinNetConfig_TEMPLATE = VBoxR3StaticDllNoAsan
  WinNetConfig_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  WinNetConfig_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE

trunk/src/VBox/HostDrivers/win/Makefile.kmk

@@ -28 +28 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+# For the installer helpers
 LIBRARIES += VBoxDrvCfg
-VBoxDrvCfg_TEMPLATE       = VBOXR3STATIC
+VBoxDrvCfg_TEMPLATE       = VBoxR3StaticDllNoAsan
 VBoxDrvCfg_SDKS           = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
 VBoxDrvCfg_DEFS           = _WIN32_WINNT=0x0501 _UNICODE UNICODE

trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
+
 DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBoxR3StaticDll
-VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
-VBoxInstallHelper_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxInstallHelper_DEPS     = $(VBOX_SVN_REV_KMK)
+VBoxInstallHelper_TEMPLATE = VBoxR3StaticDllNoAsan
+VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBOX_SVN_REV=$(VBOX_SVN_REV)
 ifdef VBOX_WITH_NETFLT
+ VBoxInstallHelper_SDKS   += VBOX_WIN_NEWDEV
  VBoxInstallHelper_DEFS   += VBOX_WITH_NETFLT=1
 endif
+VBoxInstallHelper_DEPS     = $(VBOX_SVN_REV_KMK)
 VBoxInstallHelper_SOURCES  = \
         VBoxInstallHelper.cpp \
@@ -33 +35 @@
         VBoxCommon.cpp
 ifndef VBOX_OSE
- VBoxInstallHelper_SOURCES += internal/VBoxSerial.cpp
+ VBoxInstallHelper_SOURCES += \
+        internal/VBoxSerial.cpp
 endif
-VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
-VBoxInstallHelper_LIBS    += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
+VBoxInstallHelper_LIBS    = \
+        $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
 ifdef VBOX_WITH_NETFLT
- VBoxInstallHelper_SDKS   += VBOX_WIN_NEWDEV
  VBoxInstallHelper_LIBS   += \
         $(PATH_STAGE_LIB)/WinNetConfig.lib \