[master] daafa94 Don't add extra flags if no sanitizer is enabled

Guillaume Quintard guillaume at varnish-software.com
Thu Feb 18 20:27:29 CET 2016


commit daafa949f0ebaaff70b7279b7d161c3606b26ac9
Author: Guillaume Quintard <guillaume at varnish-software.com>
Date:   Thu Feb 18 19:23:53 2016 +0000

    Don't add extra flags if no sanitizer is enabled
    
    Thanks fgs for catching it

diff --git a/configure.ac b/configure.ac
index edec1ec..9526ce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,9 +303,14 @@ AC_ARG_ENABLE(msan,
 	AS_HELP_STRING([--enable-msan],[enable memory sanitizer (default is NO)]),
 	MSAN_FLAGS="-fsanitize=memory")
 
-SAN_CFLAGS="-fPIC ${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -fPIE -fno-omit-frame-pointer"
+if test "x$UBSAN_FLAGS$TSAN_FLAGS$ASAN_FLAGS$MSAN_FLAGS" = x; then 
+	SAN_CFLAGS=
+	SAN_LDFLAGS=
+else
+	SAN_CFLAGS="-fPIC ${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -fPIE -fno-omit-frame-pointer"
+	SAN_LDFLAGS="${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -pie"
+fi
 AC_SUBST(SAN_CFLAGS)
-SAN_LDFLAGS="${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -pie"
 AC_SUBST(SAN_LDFLAGS)
 
 # Use jemalloc on Linux



More information about the varnish-commit mailing list