VirtualBox

Changeset 98156 in vbox for trunk


Ignore:
Timestamp:
Jan 20, 2023 11:47:06 AM (21 months ago)
Author:
vboxsync
Message:

/Config.kmk: Adjusted VBoxR3StaticDllNoAsan and VBoxR3StaticExeNoAsan to changes to VBoxR3Static wrt the IPRT lib. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98155 r98156  
    66226622 TEMPLATE_VBoxR3StaticExeNoAsan_CXXFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3Static_CXXFLAGS))
    66236623 TEMPLATE_VBoxR3StaticExeNoAsan_PCHFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3Static_PCHFLAGS))
    6624  TEMPLATE_VBoxR3StaticExeNoAsan_LDFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS))
    6625  TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.x86   = $(filter-out %clang_rt.asan-i386.lib   %clang_rt.asan_cxx-i386.lib  , $(TEMPLATE_VBoxR3Static_LIBS.x86))
    6626  TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.amd64 = $(filter-out %clang_rt.asan-x86_64.lib %clang_rt.asan_cxx-x86_64.lib, $(TEMPLATE_VBoxR3Static_LIBS.amd64))
    6627  TEMPLATE_VBoxR3StaticExeNoAsan_LIBS       = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN), $(TEMPLATE_VBoxR3Static_LIBS))
     6624 TEMPLATE_VBoxR3StaticExeNoAsan_LDFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3Static_LDFLAGS)) -InferAsanLibs:No
     6625 TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.x86   = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN),$(filter-out %clang_rt.asan-i386.lib   %clang_rt.asan_cxx-i386.lib  , $(TEMPLATE_VBoxR3Static_LIBS.x86)))
     6626 TEMPLATE_VBoxR3StaticExeNoAsan_LIBS.amd64 = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN),$(filter-out %clang_rt.asan-x86_64.lib %clang_rt.asan_cxx-x86_64.lib, $(TEMPLATE_VBoxR3Static_LIBS.amd64)))
    66286627endif
    66296628
     
    66426641# A no-ASAN version of VBoxR3StaticDll for the installer helper DLL.
    66436642#
     6643# Note! Not compatible with BLD_TRG_ARCH overrides yet.
     6644#
    66446645TEMPLATE_VBoxR3StaticDllNoAsan = VBoxR3StaticDll but w/o ASAN
    66456646TEMPLATE_VBoxR3StaticDllNoAsan_EXTENDS     = VBoxR3StaticDll
     
    66486649 TEMPLATE_VBoxR3StaticDllNoAsan_CXXFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_CXXFLAGS))
    66496650 TEMPLATE_VBoxR3StaticDllNoAsan_PCHFLAGS   = $(filter-out $(VBOX_VCC_SANITIZER_FLAGS)  , $(TEMPLATE_VBoxR3StaticDll_PCHFLAGS))
    6650  TEMPLATE_VBoxR3StaticDllNoAsan_LDFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3StaticDll_LDFLAGS))
    6651  TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.x86   = $(filter-out %clang_rt.asan_dll_thunk-i386.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.x86))
    6652  TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.amd64 = $(filter-out %clang_rt.asan_dll_thunk-x86_64.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.amd64))
    6653  TEMPLATE_VBoxR3StaticDllNoAsan_LIBS       = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN), $(TEMPLATE_VBoxR3StaticDll_LIBS))
     6651 TEMPLATE_VBoxR3StaticDllNoAsan_LDFLAGS    = $(filter-out $(VBOX_VCC_SANITIZER_LDFLAGS), $(TEMPLATE_VBoxR3StaticDll_LDFLAGS)) -InferAsanLibs:No
     6652 TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.x86   = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN),$(filter-out %clang_rt.asan_dll_thunk-i386.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.x86)))
     6653 TEMPLATE_VBoxR3StaticDllNoAsan_LIBS.amd64 = $(subst $(VBOX_LIB_RUNTIME_STATIC),$(VBOX_LIB_RUNTIME_STATIC_NO_ASAN),$(filter-out %clang_rt.asan_dll_thunk-x86_64.lib, $(TEMPLATE_VBoxR3StaticDll_LIBS.amd64)))
    66546654endif
    66556655
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