diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-06-24 20:51:13 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-06-25 19:16:32 +0100 |
| commit | 0a6f26f6d29c8762b254e2f1040fce5c3571feea (patch) | |
| tree | 6706444dab64cb0c2d6143ecb17db0e9ca2fc0cd /aclocal.m4 | |
| parent | 12b93887fd8b6a185b1bff994c865c897d22a6a6 (diff) | |
| download | haskell-0a6f26f6d29c8762b254e2f1040fce5c3571feea.tar.gz | |
Fix gcc 4.6 warnings; fixes #5176
Based on a patch from David Terei.
Some parts are a little ugly (e.g. defining things that only ASSERTs
use only when DEBUG is defined), so we might want to tweak things a
little.
I've also turned off -Werror for didn't-inline warnings, as we now
get a few such warnings.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 2e9764ccdb..d6b97fe52b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -742,7 +742,8 @@ if test -z "$GCC" then AC_MSG_ERROR([gcc is required]) fi -GccLT34= +GccLT34=NO +GccLT46=NO AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version], [ fp_cv_gcc_version="`$CC -v 2>&1 | grep 'version ' | sed -e 's/.*version [[^0-9]]*\([[0-9.]]*\).*/\1/g'`" @@ -752,9 +753,11 @@ AC_CACHE_CHECK([version of gcc], [fp_cv_gcc_version], # isn't a very good reason for that, but for now just make configure # fail. FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [3.4], GccLT34=YES) + FP_COMPARE_VERSIONS([$fp_cv_gcc_version], [-lt], [4.6], GccLT46=YES) ]) AC_SUBST([GccVersion], [$fp_cv_gcc_version]) AC_SUBST(GccLT34) +AC_SUBST(GccLT46) ])# FP_GCC_VERSION dnl Small feature test for perl version. Assumes PerlCmd |