m4: dovecot - Fix AM_LDFLAGS usage

diff --git a/configure.ac b/configure.ac
index 87b2930dee0949c96e4c28262585d8c30316466b..711ceb07a2d62db54527ab24e0f22608f9b1e5d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -338,6 +338,9 @@ DC_DOVECOT_HARDENING
 DC_DOVECOT_FUZZER
 DC_DOVECOT_CFLAGS
 
+FUZZER_CFLAGS="$FUZZER_CFLAGS $AM_CFLAGS $BINARY_CFLAGS"
+FUZZER_LDFLAGS="$FUZZER_LDFLAGS $AM_LDFLAGS $BINARY_LDFLAGS"
+
 DOVECOT_NSL
 DOVECOT_LIBCAP
 
@@ -800,6 +803,7 @@ TEST_CFLAGS="-DTEST_DIR=\\\"\\\$(abs_top_builddir)/.test\\\""
 AM_CFLAGS="$AM_CFLAGS $TEST_CFLAGS $EXTRA_CFLAGS"
 AM_CXXFLAGS="$AM_CXXFLAGS $TEST_CFLAGS $EXTRA_CFLAGS"
 AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_LDFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 BINARY_LDFLAGS="$PIE_LDFLAGS $RELRO_LDFLAGS"
 BINARY_CFLAGS="$PIE_CFLAGS"

diff --git a/m4/dovecot.m4 b/m4/dovecot.m4
index ef1135e40be9310d64fe7ed514a2ac86bbf9972e..f6be85d9af554530d45f431ca77d712054b7803e 100644 (file)
--- a/m4/dovecot.m4
+++ b/m4/dovecot.m4
@@ -72,7 +72,7 @@ AC_DEFUN([DC_LTO], [
       *)
         gl_COMPILER_OPTION_IF([-flto=auto -ffat-lto-objects], [
           AM_CFLAGS="$AM_CFLAGS -flto=auto -ffat-lto-objects"
-          AM_LDFLAGS="-flto"
+          AM_LDFLAGS="$AM_LDFLAGS -flto"
         ],
         [AC_MSG_ERROR([LTO support requested but not present])],
         [AC_LANG_PROGRAM()])