diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-04-08 20:48:13 +1000 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-04-09 09:49:11 +1000 |
| commit | 2c45537721ff383176534ec1a22b99381330db73 (patch) | |
| tree | 68b603c0712fdb14be2bafa724546976dac76b43 /configure.ac | |
| parent | ac940e4175933ef9ddf7ea3500de24ebc41738b4 (diff) | |
| download | flac-2c45537721ff383176534ec1a22b99381330db73.tar.gz | |
configure.ac : Allow -Werror to be enabled when using clang.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 2b530662..d88dffa1 100644 --- a/configure.ac +++ b/configure.ac @@ -262,8 +262,8 @@ FLAC__TEST_LEVEL=2 fi AC_SUBST(FLAC__TEST_LEVEL) -AC_ARG_ENABLE(gcc-werror, - AC_HELP_STRING([--enable-gcc-werror], [Enable -Werror in all Makefiles])) +AC_ARG_ENABLE(werror, + AC_HELP_STRING([--enable-werror], [Enable -Werror in all Makefiles])) AC_ARG_ENABLE(stack-smash-protection, AC_HELP_STRING([--enable-stack-smash-protection], [Enable GNU GCC stack smash protection])) @@ -396,11 +396,6 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef -Wunreachable-code " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations - if test x$enable_gcc_werror = "xyes" ; then - CFLAGS="$CFLAGS -Werror " - CXXFLAGS="$CXXFLAGS -Werror " - fi - XIPH_ADD_CFLAGS([-Wdeclaration-after-statement]) XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2]) @@ -426,6 +421,14 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then XIPH_ADD_CFLAGS([-Wextra]) +if test x$enable_werror = "xyes" ; then + XIPH_ADD_CFLAGS([-Werror]) + AC_LANG_PUSH([C++]) + XIPH_ADD_CXXFLAGS([-Werror]) + AC_LANG_POP([C++]) + fi + + if test x$enable_stack_smash_protection = "xyes" ; then XIPH_GCC_STACK_PROTECTOR XIPH_GXX_STACK_PROTECTOR |