clean up logic of configure and make for sanitizer flags

diff --git a/Makefile.in b/Makefile.in
index 816e8d47e9119d30b13ef4f2a86e3ffba1760ebe..0747ec85691568f5cebcc4fb7d8232b582fc41ec 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,12 +20,6 @@ CFLAGS=-O
 #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
 #           -Wstrict-prototypes -Wmissing-prototypes
 
-WITH_SANITIZERS=
-WITH_MSAN=
-WITH_FUZZERS=
-SANITIZERS_CFLAGS=
-MSAN_CFLAGS=
-
 SFLAGS=-O
 LDFLAGS=-L.
 LIBNAME1=libz-ng
@@ -116,25 +110,19 @@ $(ARCHDIR)/%.lo: $(SRCDIR)/$(ARCHDIR)/%.c
 test: all
        $(MAKE) -C test
 
+# This variable is set by configure.
+WITH_FUZZERS=
+
 # By default, use our own standalone_fuzz_target_runner.
 # This runner does no fuzzing, but simply executes the inputs
 # provided via parameters.
 # Run e.g. "make all LIB_FUZZING_ENGINE=/path/to/libFuzzer.a"
 # to link the fuzzer(s) against a real fuzzing engine.
-ifneq (,$(LIB_FUZZING_ENGINE))
+ifeq (,$(LIB_FUZZING_ENGINE))
+  LIB_FUZZING_ENGINE = standalone_fuzz_target_runner.o
+else
   # OSS-Fuzz will define its own value for LIB_FUZZING_ENGINE.
   WITH_FUZZERS=1
-else
-  LIB_FUZZING_ENGINE = standalone_fuzz_target_runner.o
-  ifeq (1,$(WITH_SANITIZERS))
-  CFLAGS := $(CFLAGS) $(SANITIZERS_CFLAGS)
-  LDFLAGS := $(LDFLAGS) $(SANITIZERS_CFLAGS)
-  else
-    ifeq (1,$(WITH_MSAN))
-    CFLAGS := $(CFLAGS) $(MSAN_CFLAGS)
-    LDFLAGS := $(LDFLAGS) $(MSAN_CFLAGS)
-    endif
-  endif
 endif
 
 ifeq (1,$(WITH_FUZZERS))

diff --git a/configure b/configure
index 005ad9cbc5122266d5a2343abd5da60c009e3afa..f006c644f2618ec28b7b7c707564a00aa1a47822 100755 (executable)
--- a/configure
+++ b/configure
@@ -567,13 +567,13 @@ if test $with_sanitizers -eq 1; then
         fi
     done
 
-    SANITIZERS_CFLAGS=""
     if test -n "$sanitizers"; then
         echo "-fsanitize=$sanitizers" | tee -a configure.log
-        SANITIZERS_CFLAGS="-fsanitize=$sanitizers"
+        CFLAGS="$CFLAGS -fsanitize=$sanitizers"
+        SFLAGS="$SFLAGS -fsanitize=$sanitizers"
+        LDFLAGS="$LDFLAGS -fsanitize=$sanitizers"
     else
         echo No | tee -a configure.log
-        with_sanitizers=0
     fi
 
     echo >> configure.log
@@ -583,11 +583,11 @@ if test $with_msan -eq 1; then
     echo -n "Checking for MSan... " | tee -a configure.log
     if try $CC -c $CFLAGS $test.c -fsanitize=memory ; then
         echo "-fsanitize=memory" | tee -a configure.log
-        MSAN_CFLAGS="-fsanitize=memory"
+        CFLAGS="$CFLAGS -fsanitize=memory"
+        SFLAGS="$SFLAGS -fsanitize=memory"
+        LDFLAGS="$LDFLAGS -fsanitize=memory"
     else
         echo No | tee -a configure.log
-        MSAN_CFLAGS=""
-        with_msan=0
     fi
 
     echo >> configure.log
@@ -1255,11 +1255,7 @@ if [ "$SRCDIR" != "$BUILDDIR" ]; then INCLUDES="-I$BUILDDIR ${INCLUDES}"; fi
 sed < $SRCDIR/Makefile.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
-/^WITH_SANITIZERS *=/s#=.*#=$with_sanitizers#
-/^WITH_MSAN *=/s#=.*#=$with_msan#
 /^WITH_FUZZERS *=/s#=.*#=$with_fuzzers#
-/^SANITIZERS_CFLAGS *=/s#=.*#=$SANITIZERS_CFLAGS#
-/^MSAN_CFLAGS *=/s#=.*#=$MSAN_CFLAGS#
 /^SFLAGS *=/s#=.*#=$SFLAGS#
 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
 /^LDSHARED *=/s#=.*#=$LDSHARED#