Changeset 93322 in vbox for trunk/src/VBox

Timestamp:

Jan 18, 2022 3:23:38 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,*.kmk: Windows ASAN build adjustments. bugref:8489 bugref:9841

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/Makefile.kmk (modified) (1 diff)
• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (1 diff)
• Installer/win/InstallHelper/Makefile.kmk (modified) (1 diff)
• Installer/win/Makefile.kmk (modified) (2 diffs)
• Installer/win/Stub/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

@@ -128 +128 @@
  ifdef VBOX_WITH_MESA3D
   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll: $$(VBoxNine_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
+        $(INSTALL) -m 644 "$<" "$(@D)"
   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll: $$(VBoxSVGA_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
+        $(INSTALL) -m 644 "$<" "$(@D)"
   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll: $$(VBoxICD_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
+        $(INSTALL) -m 644 "$<" "$(@D)"
   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll: $$(VBoxGL_1_TARGET) | $$(dir $$@)
-        $(INSTALL) -m 644 $< $(@D)
+        $(INSTALL) -m 644 "$<" "$(@D)"
 
   ifeq ($(KBUILD_TARGET_ARCH),amd64)

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

@@ -325 +325 @@
  #
  DLLS.win += VBoxNetFltNobj
- VBoxNetFltNobj_TEMPLATE   = VBoxR3Static
+ VBoxNetFltNobj_TEMPLATE   = VBoxR3StaticDll
  if defined(VBOX_SIGNING_MODE)
   VBoxNetFltNobj_INSTTYPE  = none

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

@@ -20 +20 @@
 
 DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBoxR3Static
+VBoxInstallHelper_TEMPLATE = VBoxR3StaticDll
 VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
 VBoxInstallHelper_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)

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

@@ -986 +986 @@
                   ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr110.dll msvcp110.dll \
                    ,$(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS))) \
+                 $(if-expr "$(KBUILD_TYPE)"=="asan",clang_rt.asan_dynamic-x86_64.dll,) \
                ,'  <File Id="file_$(dll)" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\$(dll)" />') \
                 '</Include>'
@@ -1004 +1005 @@
                   ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr110.dll msvcp110.dll \
                    ,$(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS))) \
+                 $(if-expr "$(KBUILD_TYPE)"=="asan",clang_rt.asan_dynamic-i386.dll,) \
                ,'  <File Id="file_$(dll)_x86" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\x86\$(dll)" DiskId="$$(var.Property_DiskIdCommon)" />') \
                 '</Include>'

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

@@ -50 +50 @@
         -DelayLoad:comctl32.dll
 VBoxStub_POST_CMDS = $(VBOX_CHECK_IMPORTS) --image $(out) ntdll.dll kernel32.dll
+ifeq ($(KBUILD_TYPE),asan)
+ VBoxStub_POST_CMDS += advapi32.dll
+endif
 VBoxStub_LNK_DEPS  = $(VBOX_CHECK_IMPORTS)