Changeset 86431 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Oct 2, 2020 9:13:52 PM (4 years ago)

Author:

vboxsync

Message:

Installer/linux: Include the sanitizer libs in 'asan' builds. 3rd try. bugref:9841

File:

• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (3 diffs)

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

@@ -106 +106 @@
         $(linux-misc_0_OUTDIR)/generated.sh=>scripts/generated.sh \
         $(if $(VBOX_WITH_QTGUI),$(linux-misc_0_OUTDIR)/virtualbox.desktop,)
+ifeq ($(KBUILD_TYPE),asan)
+linux-misc_SOURCES += $(foreach lib,$(VBOX_GCC_SANITIZER_SO_FILES) \
+        ,$(lib)=>$(notdir $(lib)) $(lib)=>testcase/$(notdir $(lib)) $(lib)=>tools/$(notdir $(lib)) )
+endif
 linux-misc_CLEAN = \
         $(linux-misc_0_OUTDIR)/generated.sh \
@@ -353 +357 @@
 endif
 
+# The sanitizer shared objects match the compiler we're using (HACK).
+ifeq ($(KBUILD_TYPE),asan)
+ VBOX_LNX_NO_STRIP += $(notdir $(VBOX_GCC_SANITIZER_SO_FILES))
+endif
+
 # Icons
 VBOX_MIME_ICONS = \
@@ -439 +448 @@
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
         $(QUIET)$(MKDIR) -p $(@D)
-ifeq ($(KBUILD_TYPE),asan) # Hack! Include libasan.so.* and libubsan.so.* so we have the matching version when testing.
-        $(CP_EXT) -v -- `ldd "$(VBOX_LNX_INST_OUT_DIR)/archive/VBoxRT.so" | $(SED_EXT) -re '/lib(a|ub)san\.so/!d' -e 's/.* => //' -e 's/ \(0x[0-9a-fA-F]*\) *$(DOLLAR)//'` \
-                "$(VBOX_LNX_INST_OUT_DIR)/archive/" && $(ECHO_EXT) "force external"
-endif
 ifdef VBOX_USE_PBZIP2
         $(QUIET)tar --dereference --owner 0 --group 0 \