diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/bliss/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/newhope/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/ntru/Makefile.am | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e4832b391..f01631474 100644 --- a/configure.ac +++ b/configure.ac @@ -350,6 +350,7 @@ fi if test -z "$CFLAGS"; then CFLAGS="-g -O2 -Wall -Wno-format -Wno-format-security -Wno-pointer-sign" fi +AC_SUBST(PLUGIN_CFLAGS) AC_PROG_CC AM_PROG_CC_C_O @@ -877,7 +878,7 @@ AC_COMPILE_IFELSE( AC_MSG_RESULT([no]) # GCC, but not MinGW requires -rdynamic for plugins if test x$windows != xtrue; then - AC_SUBST(PLUGIN_CFLAGS, [-rdynamic]) + PLUGIN_CFLAGS="$PLUGIN_CFLAGS -rdynamic" fi ] ) @@ -1233,6 +1234,7 @@ if test x$coverage = xtrue; then COVERAGE_LDFLAGS="-fprofile-arcs" AC_SUBST(COVERAGE_CFLAGS) AC_SUBST(COVERAGE_LDFLAGS) + PLUGIN_CFLAGS="$PLUGIN_CFLAGS $COVERAGE_CFLAGS" AC_MSG_NOTICE([coverage enabled, adding "-g -O0" to CFLAGS]) CFLAGS="${CFLAGS} -g -O0" diff --git a/src/libstrongswan/plugins/bliss/Makefile.am b/src/libstrongswan/plugins/bliss/Makefile.am index b2d09427e..cbe47063d 100644 --- a/src/libstrongswan/plugins/bliss/Makefile.am +++ b/src/libstrongswan/plugins/bliss/Makefile.am @@ -3,8 +3,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/libstrongswan/math/libnttfft AM_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - @COVERAGE_CFLAGS@ + $(PLUGIN_CFLAGS) # these file are also used by bliss_huffman noinst_LTLIBRARIES = libbliss-params.la diff --git a/src/libstrongswan/plugins/newhope/Makefile.am b/src/libstrongswan/plugins/newhope/Makefile.am index b01987d22..8dd6c5fab 100644 --- a/src/libstrongswan/plugins/newhope/Makefile.am +++ b/src/libstrongswan/plugins/newhope/Makefile.am @@ -3,8 +3,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/libstrongswan/math/libnttfft AM_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - @COVERAGE_CFLAGS@ + $(PLUGIN_CFLAGS) # these files are also used by the tests, we can't directly refer to them # because of the subdirectory, which would cause distclean to fail diff --git a/src/libstrongswan/plugins/ntru/Makefile.am b/src/libstrongswan/plugins/ntru/Makefile.am index c9fcee982..4045544d4 100644 --- a/src/libstrongswan/plugins/ntru/Makefile.am +++ b/src/libstrongswan/plugins/ntru/Makefile.am @@ -2,8 +2,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/libstrongswan AM_CFLAGS = \ - $(PLUGIN_CFLAGS) \ - @COVERAGE_CFLAGS@ + $(PLUGIN_CFLAGS) if MONOLITHIC noinst_LTLIBRARIES = libstrongswan-ntru.la |