diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-10-16 18:12:26 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-10-16 18:12:26 +0200 |
| commit | 89f3b1b7fccfeb6e96712cb8923f6d20c37bcbb0 (patch) | |
| tree | 795a162030e93c5b41419b903f22f5a42f524b84 /acinclude.m4 | |
| parent | Fix maintainer mode with GCC/Clang. (diff) | |
| download | apache2-89f3b1b7fccfeb6e96712cb8923f6d20c37bcbb0.tar.xz apache2-89f3b1b7fccfeb6e96712cb8923f6d20c37bcbb0.zip | |
Follow up to r1812263.
As suggested by Joe, add --maintainer/debugger-mode's CFLAGS in
NOTEST_CFLAGS to avoid interractions with autoconf's AC_LANG_PROGRAM.
APACHE_ADD_GCC_CFLAG now also forces -Wno-strict-prototypes for -Werror
to work despite AC_LANG_PROGRAM generating this warning by itself.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1812301 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3ab82d726b..336f5ab697 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -958,22 +958,26 @@ YES_IS_DEFINED ]) dnl -dnl APACHE_ADD_GCC_CFLAGS +dnl APACHE_ADD_GCC_CFLAG dnl -dnl Check if compiler is gcc and supports flag. If yes, add to CFLAGS. +dnl Check if compiler is gcc and supports flag. If yes, add to NOTEST_CFLAGS. +dnl NOTEST_CFLAGS is merged lately, thus it won't accumulate in CFLAGS here. +dnl Also, AC_LANG_PROGRAM() itself is known to trigger [-Wstrict-prototypes] +dnl with some autoconf versions, so we force -Wno-strict-prototypes for the +dnl check to avoid spurious failures when adding flags like -Werror. dnl AC_DEFUN([APACHE_ADD_GCC_CFLAG], [ define([ap_gcc_ckvar], [ac_cv_gcc_]translit($1, [-:.=], [____])) if test "$GCC" = "yes"; then AC_CACHE_CHECK([whether gcc accepts $1], ap_gcc_ckvar, [ save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" + CFLAGS="$CFLAGS $1 -Wno-strict-prototypes" AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ap_gcc_ckvar=yes], [ap_gcc_ckvar=no]) CFLAGS="$save_CFLAGS" ]) if test "$]ap_gcc_ckvar[" = "yes" ; then - APR_ADDTO(CFLAGS,[$1]) + APR_ADDTO(NOTEST_CFLAGS,[$1]) fi fi undefine([ap_gcc_ckvar]) |