Changeset 66177 in vbox

Timestamp:

Mar 21, 2017 1:44:05 PM (8 years ago)

Author:

vboxsync

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

114089

Message:

Config.kmk: Simplify VBOX_WITH_GCC_SANITIZER / VBOX_GCC_SANITIZER_FLAGS / VBOX_GCC_NO_UNDEFINED / VBOX_GCC_NO_UNDEFINED_R0.

File:

• trunk/Config.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -2777 +2777 @@
 # The address sanitiser library intercepts dlopen() and breaks RPATH $ORIGIN,
 # so we need to link it statically.
-VBOX_GCC_SANITIZER_FLAGS = \
-  -fsanitize=undefined \
-  -fsanitize=address \
-  -fsanitize=return \
-  -fsanitize=bounds \
-  -fsanitize=object-size \
-  -fno-sanitize=alignment \
-  -fno-sanitize=vptr \
-  -fno-common \
-  -static-libasan
+ifdef VBOX_WITH_GCC_SANITIZER
+ VBOX_GCC_SANITIZER_FLAGS := \
+        -fsanitize=undefined \
+        -fsanitize=address \
+        -fsanitize=return \
+        -fsanitize=bounds \
+        -fsanitize=object-size \
+        -fno-sanitize=alignment \
+        -fno-sanitize=vptr \
+        -fno-common \
+        -static-libasan
+else
+ VBOX_GCC_SANITIZER_FLAGS =
+endif
 
 # -libasan-static is currently not supported in combination with -no-undefined.
-VBOX_GCC_NO_UNDEFINED=$(if $(VBOX_WITH_GCC_SANITIZER),,-Wl,--no-undefined)
-VBOX_GCC_NO_UNDEFINED_R0=$(if $(VBOX_WITH_GCC_SANITIZER),,-no-undefined)
+ifdef VBOX_WITH_GCC_SANITIZER
+ VBOX_GCC_NO_UNDEFINED    :=
+ VBOX_GCC_NO_UNDEFINED_R0 :=
+else
+ VBOX_GCC_NO_UNDEFINED    := -Wl,--no-undefined
+ VBOX_GCC_NO_UNDEFINED_R0 := -no-undefined
+endif
 
 # Disabled Visual C++ warnings, W4:
@@ -4568 +4577 @@
 TEMPLATE_VBOXR3EXE_CXXFLAGS.sparc64    = -m64
 TEMPLATE_VBOXR3EXE_CXXFLAGS.kprofile   = -finstrument-functions
-TEMPLATE_VBOXR3EXE_CXXFLAGS.debug      = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
+TEMPLATE_VBOXR3EXE_CXXFLAGS.debug      = $(VBOX_GCC_SANITIZER_FLAGS)
 TEMPLATE_VBOXR3EXE_CFLAGS              = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C)   $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
  ifdef VBOX_WITH_NO_GCC_WARNING_POLICY
@@ -4595 +4604 @@
 TEMPLATE_VBOXR3EXE_LDFLAGS.linux       = -Wl,-z,noexecstack,-z,relro $(VBOX_LD_as_needed)
 TEMPLATE_VBOXR3EXE_LDFLAGS.solaris     = -Wl,-z,ignore # same as VBOX_LD_as_needed
-TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
+TEMPLATE_VBOXR3EXE_LDFLAGS.debug       = $(VBOX_GCC_SANITIZER_FLAGS)
 
  ifeq ($(KBUILD_TARGET),linux)
@@ -5376 +5385 @@
 TEMPLATE_VBOXMAINEXE_CXXFLAGS.amd64      = -m64
 TEMPLATE_VBOXMAINEXE_CXXFLAGS.kprofile   = -finstrument-functions
-TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug      = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
+TEMPLATE_VBOXMAINEXE_CXXFLAGS.debug      = $(VBOX_GCC_SANITIZER_FLAGS)
 TEMPLATE_VBOXMAINEXE_CFLAGS              = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) $(VBOX_GCC_Wno-variadic-macros) \
         $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_IPRT_FMT_CHECK)
@@ -5396 +5405 @@
 TEMPLATE_VBOXMAINEXE_LDFLAGS.x86         = -m32
 TEMPLATE_VBOXMAINEXE_LDFLAGS.amd64       = -m64
-TEMPLATE_VBOXMAINEXE_LDFLAGS.debug       = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
+TEMPLATE_VBOXMAINEXE_LDFLAGS.debug       = $(VBOX_GCC_SANITIZER_FLAGS)
  ifeq ($(KBUILD_TARGET),linux)
 TEMPLATE_VBOXMAINEXE_LIBS                = pthread m rt $(LIB_RUNTIME) dl
@@ -5929 +5938 @@
   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.amd64 = -m64
   TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.linux = -pthread
-  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.debug = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
+  TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.debug = $(VBOX_GCC_SANITIZER_FLAGS)
   TEMPLATE_VBOXQTGUIEXE_OBJCFLAGS = -g $(VBOX_GCC_pipe) $(VBOX_GCC_PEDANTIC_C) -fno-exceptions $(VBOX_GCC_IPRT_FMT_CHECK)
   TEMPLATE_VBOXQTGUIEXE_OBJCFLAGS.x86 = $(TEMPLATE_VBOXQTGUIEXE_CXXFLAGS.x86)
@@ -5943 +5952 @@
   TEMPLATE_VBOXQTGUIEXE_LDFLAGS.x86 = -m32
   TEMPLATE_VBOXQTGUIEXE_LDFLAGS.amd64 = -m64
-  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.debug = $(if $(VBOX_WITH_GCC_SANITIZER),$(VBOX_GCC_SANITIZER_FLAGS),)
+  TEMPLATE_VBOXQTGUIEXE_LDFLAGS.debug = $(VBOX_GCC_SANITIZER_FLAGS)
   TEMPLATE_VBOXQTGUIEXE_LIBS = \
         $(VBOX_LIBS_QT) \