auth, rec, dnsdist: always show sanitizers in C[XX]FLAGS in configure output

diff --git a/configure.ac b/configure.ac
index 590e3accf6da7977d0b861972536005094f41561..2747079c4e7b8f255d5b291a058dda07241e8d61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -304,6 +304,7 @@ AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 AC_SUBST([IPCRYPT_CFLAGS], ['-I$(top_srcdir)/ext/ipcrypt'])
 AC_SUBST([IPCRYPT_LIBS], ['$(top_builddir)/ext/ipcrypt/libipcrypt.la'])
 
+CFLAGS="$SANITIZER_FLAGS $CFLAGS"
 CXXFLAGS="$SANITIZER_FLAGS $CXXFLAGS"
 
 AC_ARG_VAR(PACKAGEVERSION, [The version used in secpoll queries])

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 812d8e1e011d1f290551e76b13294044649b0d68..e39eddb850a27a1491046d0331dad7c8a30be7e1 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -4,7 +4,6 @@ AM_CPPFLAGS += $(SYSTEMD_CFLAGS) \
        $(LIBSODIUM_CFLAGS) \
        $(FSTRM_CFLAGS) \
        $(YAHTTP_CFLAGS) \
-       $(SANITIZER_FLAGS) \
        $(NET_SNMP_CFLAGS) \
        $(LIBCAP_CFLAGS) \
        -DSYSCONFDIR=\"${sysconfdir}\"
@@ -289,7 +288,6 @@ dnsdist_LDADD = \
        $(YAHTTP_LIBS) \
        $(LIBSODIUM_LIBS) \
        $(FSTRM_LIBS) \
-       $(SANITIZER_FLAGS) \
        $(SYSTEMD_LIBS) \
        $(NET_SNMP_LIBS) \
        $(LIBCAP_LIBS) \
@@ -307,7 +305,6 @@ testrunner_LDADD = \
        $(LIBSODIUM_LIBS) \
        $(LUA_LIBS) \
        $(RT_LIBS) \
-       $(SANITIZER_FLAGS) \
        $(LIBCAP_LIBS)
 
 if HAVE_CDB

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index cba6cc68536952ad4fb3de7156ef7d577c55deaf..c4e4d0b77d2a18d554e28bc4daa4c1a6d25d5954 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -128,8 +128,8 @@ AM_COND_IF([HAVE_MANPAGES],[],[
 
 LDFLAGS="$RELRO_LDFLAGS $LDFLAGS"
 
-CFLAGS="$PIE_CFLAGS $CFLAGS"
-CXXFLAGS="$PIE_CFLAGS $CXXFLAGS"
+CFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CFLAGS"
+CXXFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CXXFLAGS"
 
 PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS"
 AC_SUBST([PROGRAM_LDFLAGS])

diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac
index 4b05096fd2c948c2e56915e2317610cc7875d65a..6ce96679a3a7f0ff04bf7c238eacaaacc1885c56 100644 (file)
--- a/pdns/recursordist/configure.ac
+++ b/pdns/recursordist/configure.ac
@@ -157,7 +157,7 @@ AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
 AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
 
 LDFLAGS="$RELRO_LDFLAGS $LDFLAGS"
-CFLAGS="$PIE_CFLAGS $CFLAGS"
+CFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CFLAGS"
 CXXFLAGS="$SANITIZER_FLAGS $PIE_CFLAGS $CXXFLAGS"
 PROGRAM_LDFLAGS="$PIE_LDFLAGS $PROGRAM_LDFLAGS"
 AC_SUBST([PROGRAM_LDFLAGS])