VirtualBox

Changeset 93322 in vbox for trunk


Ignore:
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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r93297 r93322  
    28442844 if "$(KBUILD_TARGET)" == "linux"
    28452845VBOX_WITH_GCC_SANITIZER := 1
     2846 else if "$(KBUILD_TARGET)" == "win"
     2847VBOX_WITH_VCC_SANITIZER := 1
    28462848 else
    28472849VBOX_WITH_EF_WRAPS := 1
    … …  
    28872889  VBOX_GCC_SANITIZER_LDFLAGS += -lasan
    28882890 endif
     2891endif
     2892
     2893# The config for Visual C++ 2019 update 9 and later.
     2894ifdef VBOX_WITH_VCC_SANITIZER
     2895 VBOX_VCC_SANITIZER_FLAGS      := -fsanitize=address -fno-sanitize-address-vcasan-lib
     2896 # experimental: VBOX_VCC_SANITIZER_FLAGS += /fsanitize-address-use-after-return
     2897 VBOX_VCC_SANITIZER_LDFLAGS    :=
     2898else
     2899 VBOX_VCC_SANITIZER_FLAGS      :=
     2900 VBOX_VCC_SANITIZER_LDFLAGS    :=
    28892901endif
    28902902
    … …  
    57935805 endif
    57945806 TEMPLATE_VBOXR3EXE_CXXFLAGS           = -Zi -Zl -GR- -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -Zc:wchar_t- $(VBOX_VCC_OPT) $(VBOX_VCC_FP) \
    5795         -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR)
     5807        -Gy $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS) $(VBOX_VCC_WARN_ALL) $(VBOX_VCC_WERR)
    57965808 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC120"
    57975809  TEMPLATE_VBOXR3EXE_CXXFLAGS         += -Gw
    … …  
    58135825 TEMPLATE_VBOXR3EXE_LDFLAGS            = -Ignore:4197 \
    58145826        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
    5815         $(VBOX_VCC_LD_GUARD_CF) \
     5827        $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \
    58165828        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
    58175829        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
    … …  
    58415853        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
    58425854        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.amd64)_LIB)/oldnames.lib
     5855  ifeq ($(KBUILD_TYPE),asan)
     5856   TEMPLATE_VBOXR3EXE_LIBS.x86         += \
     5857        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic-i386.lib \
     5858        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic_runtime_thunk-i386.lib
     5859   TEMPLATE_VBOXR3EXE_LIBS.amd64       += \
     5860        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic-x86_64.lib \
     5861        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib
     5862  endif
    58435863 else
    58445864  TEMPLATE_VBOXR3EXE_LIBS.x86           = \
    … …  
    61416161        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
    61426162        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib
     6163  ifeq ($(KBUILD_TYPE),asan)
     6164   TEMPLATE_VBOXR3STATIC_LIBS.x86         += \
     6165        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/clang_rt.asan-i386.lib \
     6166        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.x86)_LIB)/clang_rt.asan_cxx-i386.lib
     6167   TEMPLATE_VBOXR3STATIC_LIBS.amd64       += \
     6168        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/clang_rt.asan-x86_64.lib \
     6169        $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/clang_rt.asan_cxx-x86_64.lib
     6170  endif
    61436171 else
    61446172  TEMPLATE_VBOXR3STATIC_LIBS.x86           = \
    … …  
    62176245  TEMPLATE_VBoxR3Static_LIBS       += kstat
    62186246 endif
     6247endif
     6248
     6249#
     6250# A DLL capable version of VBoxR3Static
     6251#
     6252TEMPLATE_VBoxR3StaticDll             = VBox Static Ring-3 DLL
     6253TEMPLATE_VBoxR3StaticDll_EXTENDS     = VBoxR3Static
     6254if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "asan"
     6255 TEMPLATE_VBoxR3StaticDll_LIBS.x86   = $(patsubst %clang_rt.asan-i386.lib, %clang_rt.asan_dll_thunk-i386.lib, $(filter-out %clang_rt.asan_cxx-i386.lib,$(TEMPLATE_VBoxR3Static_LIBS.x86)))
     6256 TEMPLATE_VBoxR3StaticDll_LIBS.amd64 = $(patsubst %clang_rt.asan-x86_64.lib, %clang_rt.asan_dll_thunk-x86_64.lib, $(filter-out %clang_rt.asan_cxx-x86_64.lib,$(TEMPLATE_VBoxR3Static_LIBS.amd64)))
    62196257endif
    62206258
    … …  
    62596297        $(PATH_TOOL_$(TEMPLATE_VBoxR3StaticNoCrt_TOOL.win.x86)_LIB)/chkstk.obj
    62606298TEMPLATE_VBoxR3StaticNoCrt_SDKS.win.x86   += VBOX_WIN_INT64
    6261 TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF), $(TEMPLATE_VBoxR3Static_LDFLAGS))
     6299TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
    62626300TEMPLATE_VBoxR3StaticNoCrt_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxR3Static_LDFLAGS.win.x86))
    6263 TEMPLATE_VBoxR3StaticNoCrt_CFLAGS          = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF),$(TEMPLATE_VBoxR3Static_CFLAGS)) /GS- -EHs-
    6264 TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF),$(TEMPLATE_VBoxR3Static_CXXFLAGS)) /GS- -EHs-
    6265 TEMPLATE_VBoxR3StaticNoCrt_PCHFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF),$(TEMPLATE_VBoxR3Static_PCHFLAGS)) /GS- -EHs-
     6301TEMPLATE_VBoxR3StaticNoCrt_CFLAGS          = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_CFLAGS)) /GS- -EHs-
     6302TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_CXXFLAGS)) /GS- -EHs-
     6303TEMPLATE_VBoxR3StaticNoCrt_PCHFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxR3Static_PCHFLAGS)) /GS- -EHs-
    62666304TEMPLATE_VBoxR3StaticNoCrt_CXXFLAGS.debug  = $(filter-out /RTC% -RTC%, $(TEMPLATE_VBoxR3Static_CXXFLAGS.debug))
    62676305else
    … …  
    68316869 endif
    68326870 TEMPLATE_VBOXMAINEXE_CXXFLAGS           = -Zi -Zl -GR -EHsc -GF -MD$(VBOX_VCC_CRT_TYPE) -Zc:wchar_t- \
    6833         $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_CC_GUARD_CF)
     6871        $(VBOX_VCC_OPT) $(VBOX_VCC_FP) $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS)
    68346872 #    -wd4625: 'DisplaySourceBitmap' : copy constructor could not be generated because a base class copy constructor is inaccessible
    68356873 #    -wd4626: 'DisplaySourceBitmap' : assignment operator could not be generated because a base class assignment operator is inaccessible
    … …  
    68576895 TEMPLATE_VBOXMAINEXE_LDFLAGS            = -Ignore:4197 \
    68586896        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
    6859         $(VBOX_VCC_LD_GUARD_CF) \
     6897        $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS) \
    68606898        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
    68616899        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
    … …  
    68926930        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/msvcprt$(VBOX_VCC_CRT_TYPE).lib \
    68936931        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/oldnames.lib
     6932  ifeq ($(KBUILD_TYPE),asan)
     6933   TEMPLATE_VBOXMAINEXE_LIBS.x86         += \
     6934        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic-i386.lib \
     6935        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.x86)_LIB)/clang_rt.asan_dynamic_runtime_thunk-i386.lib
     6936   TEMPLATE_VBOXMAINEXE_LIBS.amd64       += \
     6937        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic-x86_64.lib \
     6938        $(PATH_TOOL_$(TEMPLATE_VBOXMAINEXE_TOOL.win.amd64)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib
     6939  endif
    68946940 else
    68956941  TEMPLATE_VBOXMAINEXE_LIBS.x86           = \
    … …  
    74807526     QT_DLL _CRT_SECURE_NO_DEPRECATE \
    74817527     $(QMAKE_PRL_DEFINES)
    7482   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t- $(VBOX_VCC_CC_GUARD_CF)
     7528  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS = -nologo -Zm200 -MD -Zi -EHsc -Zc:wchar_t- $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS)
    74837529  #    -wd4481: nonstandard extension used: override specifier 'override'
    74847530  #    -wd4625: 'QRubberBand' : copy constructor could not be generated because a base class copy constructor is inaccessible
    … …  
    75237569  TEMPLATE_VBOXQTGUIEXE_LDFLAGS = -Ignore:4197 \
    75247570        /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug /Opt:Ref /Opt:Icf \
    7525         $(VBOX_VCC_LD_GUARD_CF) \
     7571        $(VBOX_VCC_LD_GUARD_CF)  $(VBOX_VCC_SANITIZER_LDFLAGS) \
    75267572        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
    75277573        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
    … …  
    75427588        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/oldnames.lib \
    75437589        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
     7590  ifeq ($(KBUILD_TYPE),asan)
     7591   TEMPLATE_VBOXQTGUIEXE_LIBS += \
     7592        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/clang_rt.asan_dynamic-x86_64.lib \
     7593        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/clang_rt.asan_dynamic_runtime_thunk-x86_64.lib
     7594  endif
    75447595  else
    75457596   TEMPLATE_VBOXQTGUIEXE_LIBS = \
    … …  
    80678118        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
    80688119        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/oldnames.lib
     8120  ifeq ($(KBUILD_TYPE),asan)
     8121   TEMPLATE_VBOXGUESTR3EXE_LIBS.x86         += \
     8122        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.x86)_LIB)/clang_rt.asan-i386.lib \
     8123        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.x86)_LIB)/clang_rt.asan_cxx-i386.lib
     8124   TEMPLATE_VBOXGUESTR3EXE_LIBS.amd64       += \
     8125        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/clang_rt.asan-x86_64.lib \
     8126        $(PATH_TOOL_$(TEMPLATE_VBOXGUESTR3EXE_TOOL.win.amd64)_LIB)/clang_rt.asan_cxx-x86_64.lib
     8127  endif
    80698128 else
    80708129  TEMPLATE_VBOXGUESTR3EXE_LIBS.x86           = \
    … …  
    81758234TEMPLATE_VBOXGUESTR3DLL_EXTENDS   = VBOXGUESTR3EXE
    81768235## @todo add a INSTFUN that separates dlls and libs.
    8177 ifn1of ($(KBUILD_TARGET), darwin os2 win)
     8236ifeq ($(KBUILD_TARGET),win)
     8237 ifeq ($(KBUILD_TYPE),asan)
     8238  TEMPLATE_VBOXGUESTR3DLL_LIBS.x86   = $(patsubst %clang_rt.asan-i386.lib, %clang_rt.asan_dll_thunk-i386.lib, $(filter-out %clang_rt.asan_cxx-i386.lib,$(TEMPLATE_VBOXGUESTR3EXE_LIBS.x86)))
     8239  TEMPLATE_VBOXGUESTR3DLL_LIBS.amd64 = $(patsubst %clang_rt.asan-x86_64.lib, %clang_rt.asan_dll_thunk-x86_64.lib, $(filter-out %clang_rt.asan_cxx-x86_64.lib,$(TEMPLATE_VBOXGUESTR3EXE_LIBS.amd64)))
     8240 endif
     8241else ifn1of ($(KBUILD_TARGET), darwin os2 win)
    81788242 TEMPLATE_VBOXGUESTR3DLL_DEFS     = $(TEMPLATE_VBOXGUESTR3EXE_DEFS) PIC
    81798243 TEMPLATE_VBOXGUESTR3DLL_CFLAGS   = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fPIC
    … …  
    83198383        $(PATH_TOOL_$(TEMPLATE_VBoxGuestR3NoCrtExe_TOOL.win.x86)_LIB)/chkstk.obj
    83208384TEMPLATE_VBoxGuestR3NoCrtExe_SDKS.win.x86    = VBOX_WIN_INT64
    8321 TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF), $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS))
     8385TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS         = $(filter-out $(VBOX_VCC_LD_GUARD_CF) $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS))
    83228386TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win.x86 = $(filter-out -Include%, $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win.x86))
    83238387TEMPLATE_VBoxGuestR3NoCrtExe_LDFLAGS.win     = $(TEMPLATE_VBoxGuestR3Exe_LDFLAGS.win) /entry:CustomMainEntrypoint /subsystem:console
    8324 TEMPLATE_VBoxGuestR3NoCrtExe_CFLAGS          = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF),$(TEMPLATE_VBoxGuestR3Exe_CFLAGS)) /GS- -EHs-
    8325 TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF),$(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS)) /GS- -EHs-
    8326 TEMPLATE_VBoxGuestR3NoCrtExe_PCHFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF),$(TEMPLATE_VBoxGuestR3Exe_PCHFLAGS)) /GS- -EHs-
     8388TEMPLATE_VBoxGuestR3NoCrtExe_CFLAGS          = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_CFLAGS)) /GS- -EHs-
     8389TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS)) /GS- -EHs-
     8390TEMPLATE_VBoxGuestR3NoCrtExe_PCHFLAGS        = $(filter-out -EH% -GS $(VBOX_VCC_CC_GUARD_CF) $(VBOX_VCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3Exe_PCHFLAGS)) /GS- -EHs-
    83278391TEMPLATE_VBoxGuestR3NoCrtExe_CXXFLAGS.debug  = $(filter-out /RTC% -RTC%, $(TEMPLATE_VBoxGuestR3Exe_CXXFLAGS.debug))
    83288392else

  • trunk/Makefile.kmk

    r93115 r93322  
    142142                $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)))) \
    143143        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
     144   endif
     145  endif
     146  ifeq ($(KBUILD_TYPE),asan)
     147   ifeq ($(KBUILD_TARGET_ARCH),amd64)
     148InstallExternalLibs_SOURCES += \
     149        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dynamic-x86_64.dll) \
     150        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dynamic-x86_64.dll)=>testcase/clang_rt.asan_dynamic-x86_64.dll
     151    ifeq ($(VBOX_VCC_CRT_TYPE),d)
     152InstallExternalLibs_SOURCES += \
     153        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dbg_dynamic-x86_64.dll) \
     154        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dbg_dynamic-x86_64.dll)=>testcase/clang_rt.asan_dbg_dynamic-x86_64.dll
     155    endif
     156   endif
     157   ifeq ($(KBUILD_TARGET_ARCH),x86)
     158InstallExternalLibs_SOURCES += \
     159        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll) \
     160        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll)=>testcase/clang_rt.asan_dynamic-i386.dll
     161    ifeq ($(VBOX_VCC_CRT_TYPE),d)
     162InstallExternalLibs_SOURCES += \
     163        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll) \
     164        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll)=>testcase/clang_rt.asan_dbg_dynamic-i386.dll
     165    endif
     166   endif
     167   ifdef VBOX_WITH_32_ON_64_MAIN_API
     168InstallExternalLibs_SOURCES += $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll,x86)=>x86/clang_rt.asan_dynamic-i386.dll
     169    ifeq ($(VBOX_VCC_CRT_TYPE),d)
     170InstallExternalLibs_SOURCES += $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll,x86)=>x86/clang_rt.asan_dbg_dynamic-i386.dll
     171    endif
    144172   endif
    145173  endif

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

    r93115 r93322  
    128128 ifdef VBOX_WITH_MESA3D
    129129  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxNine.dll: $$(VBoxNine_1_TARGET) | $$(dir $$@)
    130         $(INSTALL) -m 644 $< $(@D)
     130        $(INSTALL) -m 644 "$<" "$(@D)"
    131131  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxSVGA.dll: $$(VBoxSVGA_1_TARGET) | $$(dir $$@)
    132         $(INSTALL) -m 644 $< $(@D)
     132        $(INSTALL) -m 644 "$<" "$(@D)"
    133133  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxICD.dll: $$(VBoxICD_1_TARGET) | $$(dir $$@)
    134         $(INSTALL) -m 644 $< $(@D)
     134        $(INSTALL) -m 644 "$<" "$(@D)"
    135135  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxGL.dll: $$(VBoxGL_1_TARGET) | $$(dir $$@)
    136         $(INSTALL) -m 644 $< $(@D)
     136        $(INSTALL) -m 644 "$<" "$(@D)"
    137137
    138138  ifeq ($(KBUILD_TARGET_ARCH),amd64)

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

    r93115 r93322  
    325325 #
    326326 DLLS.win += VBoxNetFltNobj
    327  VBoxNetFltNobj_TEMPLATE   = VBoxR3Static
     327 VBoxNetFltNobj_TEMPLATE   = VBoxR3StaticDll
    328328 if defined(VBOX_SIGNING_MODE)
    329329  VBoxNetFltNobj_INSTTYPE  = none

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

    r93115 r93322  
    2020
    2121DLLS += VBoxInstallHelper
    22 VBoxInstallHelper_TEMPLATE = VBoxR3Static
     22VBoxInstallHelper_TEMPLATE = VBoxR3StaticDll
    2323VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
    2424VBoxInstallHelper_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)

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

    r93115 r93322  
    986986                  ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr110.dll msvcp110.dll \
    987987                   ,$(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS))) \
     988                 $(if-expr "$(KBUILD_TYPE)"=="asan",clang_rt.asan_dynamic-x86_64.dll,) \
    988989               ,'  <File Id="file_$(dll)" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\$(dll)" />') \
    989990                '</Include>'
    … …  
    10041005                  ,$(if-expr "$(VBOX_VCC_TOOL_STEM)"=="VCC110",msvcr110.dll msvcp110.dll \
    10051006                   ,$(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS))) \
     1007                 $(if-expr "$(KBUILD_TYPE)"=="asan",clang_rt.asan_dynamic-i386.dll,) \
    10061008               ,'  <File Id="file_$(dll)_x86" Name="$(dll)" Source="$$(env.PATH_OUT)\bin\x86\$(dll)" DiskId="$$(var.Property_DiskIdCommon)" />') \
    10071009                '</Include>'

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

    r93239 r93322  
    5050        -DelayLoad:comctl32.dll
    5151VBoxStub_POST_CMDS = $(VBOX_CHECK_IMPORTS) --image $(out) ntdll.dll kernel32.dll
     52ifeq ($(KBUILD_TYPE),asan)
     53 VBoxStub_POST_CMDS += advapi32.dll
     54endif
    5255VBoxStub_LNK_DEPS  = $(VBOX_CHECK_IMPORTS)
    5356

  • trunk/tools/kBuildUnits/vboximportchecker.kmk

    r93275 r93322  
    3131
    3232define def_unit_vboximportchecker_target_pre
     33# Do not apply to ASAN builds as it requires newere DLLs.
     34ifneq ($(KBUILD_TYPE),asan)
    3335
    3436# Set pass 2 variable (simpler) and act on it.
    35 $(target)_2_VBOX_IMPORT_CHECKER := $(evalcall def_fn_prop_get_first_defined,VBOX_IMPORT_CHECKER)
    36 ifdef $(target)_2_VBOX_IMPORT_CHECKER
    37  $(target)_LNK_ORDERDEPS += $(VBOX_RTLDRCHECKIMPORTS)
    38  $(eval $(def_unit_vboximportchecker_internal_expand_twice))
     37 $(target)_2_VBOX_IMPORT_CHECKER := $(evalcall def_fn_prop_get_first_defined,VBOX_IMPORT_CHECKER)
     38 ifdef $(target)_2_VBOX_IMPORT_CHECKER
     39  $(target)_LNK_ORDERDEPS += $(VBOX_RTLDRCHECKIMPORTS)
     40  $(eval $(def_unit_vboximportchecker_internal_expand_twice))
     41 endif
     42
    3943endif
    4044
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette