[master] dc3115491 build: Clean up individual sanitizers enablement
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Wed Aug 25 10:21:04 UTC 2021
commit dc3115491d1df46ef8fcc849423e0512106fc210
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date: Tue Aug 24 08:41:33 2021 +0200
build: Clean up individual sanitizers enablement
Removing unused *SAN_*FLAGS variables and making sure to quote anything
that may be relevant to quote. Hopefully indenting in more readable way.
diff --git a/configure.ac b/configure.ac
index a2cfa6073..0a84b1873 100644
--- a/configure.ac
+++ b/configure.ac
@@ -272,31 +272,32 @@ CFLAGS="${save_CFLAGS}"
SAN_CFLAGS=
SAN_LDFLAGS=
-UBSAN_CFLAGS=
-UBSAN_LDFLAGS=
+
AC_ARG_ENABLE(ubsan,
- AS_HELP_STRING([--enable-ubsan],[enable undefined behavior sanitizer (default is NO)]),
- UBSAN_FLAGS="-fsanitize=undefined")
+ AS_HELP_STRING([--enable-ubsan],
+ [enable undefined behavior sanitizer (default is NO)]),
+ [UBSAN_FLAGS=-fsanitize=undefined])
-TSAN_CFLAGS=
-TSAN_LDFLAGS=
AC_ARG_ENABLE(tsan,
- AS_HELP_STRING([--enable-tsan],[enable thread sanitizer (default is NO)]),
- TSAN_FLAGS="-fsanitize=thread")
+ AS_HELP_STRING([--enable-tsan],
+ [enable thread sanitizer (default is NO)]),
+ [TSAN_FLAGS=-fsanitize=thread])
-ASAN_CFLAGS=
-ASAN_LDFLAGS=
AC_ARG_ENABLE(asan,
- AS_HELP_STRING([--enable-asan],[enable address sanitizer (default is NO)]),
- ASAN_FLAGS="-fsanitize=address"
- AX_CHECK_COMPILE_FLAG([-fsanitize=address -fsanitize-address-use-after-scope],
- [ASAN_FLAGS="${ASAN_FLAGS} -fsanitize-address-use-after-scope"]))
+ AS_HELP_STRING([--enable-asan],
+ [enable address sanitizer (default is NO)]),
+ [ASAN_FLAGS=-fsanitize=address])
+
+if test -n "$ASAN_FLAGS"; then
+ AX_CHECK_COMPILE_FLAG(
+ [$ASAN_FLAGS -fsanitize-address-use-after-scope],
+ [ASAN_FLAGS="$ASAN_FLAGS -fsanitize-address-use-after-scope"])
+fi
-MSAN_CFLAGS=
-MSAN_LDFLAGS=
AC_ARG_ENABLE(msan,
- AS_HELP_STRING([--enable-msan],[enable memory sanitizer (default is NO)]),
- MSAN_FLAGS="-fsanitize=memory")
+ AS_HELP_STRING([--enable-msan],
+ [enable memory sanitizer (default is NO)]),
+ [MSAN_FLAGS=-fsanitize=memory])
if test "x$UBSAN_FLAGS$TSAN_FLAGS$ASAN_FLAGS$MSAN_FLAGS" != "x"; then
SAN_CFLAGS="-D__SANITIZER=1 ${UBSAN_FLAGS} ${TSAN_FLAGS} ${ASAN_FLAGS} ${MSAN_FLAGS} -fPIC -fPIE -fno-omit-frame-pointer"
More information about the varnish-commit
mailing list