diff options
| author | Alan Modra <modra@gmail.com> | 2013-02-05 03:31:16 +0400 |
|---|---|---|
| committer | Alan Modra <modra@gmail.com> | 2013-02-05 03:31:16 +0400 |
| commit | 79a97aa5ea684d955f81de4f7e2d065a1e28a04f (patch) | |
| tree | d026b9c7cf03de661d912b0218f814a2b8222685 /config | |
| parent | cf4acdbc1fca41ca382efbf7e4399d82c099210a (diff) | |
* configure: Regenerate after syncing config/.
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 10 | ||||
| -rw-r--r-- | config/cloog.m4 | 15 | ||||
| -rw-r--r-- | config/isl.m4 | 10 |
3 files changed, 24 insertions, 11 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index c3079db58..c6e8b256e 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,13 @@ +2013-01-15 Richard Biener <rguenther@suse.de> + + PR other/55973 + * isl.m4 (ISL_INIT_FLAGS): Warn about disabled version check + for in-tree build. + (ISL_CHECK_VERSION): Do not use AC_CACHE_CHECK. + * cloog.m4 (CLOOG_INIT_FLAGS): Disable version check for + in-tree build and warn about that. + (CLOOG_CHECK_VERSION): Do not use AC_CACHE_CHECK. + 2013-01-07 H.J. Lu <hongjiu.lu@intel.com> * libstdc++-raw-cxx.m4 (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove diff --git a/config/cloog.m4 b/config/cloog.m4 index a92ef2ea7..670cd652f 100644 --- a/config/cloog.m4 +++ b/config/cloog.m4 @@ -57,12 +57,15 @@ AC_DEFUN([CLOOG_INIT_FLAGS], if test "x${with_cloog_lib}" != x; then clooglibs="-L$with_cloog_lib" fi - dnl If no --with-cloog flag was specified and there is in-tree ClooG - dnl source, set up flags to use that. + dnl If no --with-cloog flag was specified and there is in-tree CLooG + dnl source, set up flags to use that and skip any version tests + dnl as we cannot run them reliably before building CLooG if test "x${clooginc}" = x && test "x${clooglibs}" = x \ && test -d ${srcdir}/cloog; then clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/'"$lt_cv_objdir"' ' clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -I'${srcdir}'/cloog/include ' + ENABLE_CLOOG_CHECK=no + AC_MSG_WARN([using in-tree CLooG, disabling version check]) fi clooginc="-DCLOOG_INT_GMP ${clooginc}" @@ -115,11 +118,11 @@ AC_DEFUN([CLOOG_CHECK_VERSION], CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}" LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}" - AC_CACHE_CHECK([for version $1.$2.$3 of CLooG], - [gcc_cv_cloog], - [AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], + AC_MSG_CHECKING([for version $1.$2.$3 of CLooG]) + AC_COMPILE_IFELSE([_CLOOG_CHECK_CT_PROG($1,$2,$3)], [gcc_cv_cloog=yes], - [gcc_cv_cloog=no])]) + [gcc_cv_cloog=no]) + AC_MSG_RESULT([$gcc_cv_cloog]) CFLAGS=$_cloog_saved_CFLAGS LDFLAGS=$_cloog_saved_LDFLAGS diff --git a/config/isl.m4 b/config/isl.m4 index ba3fa1b7f..f45854d22 100644 --- a/config/isl.m4 +++ b/config/isl.m4 @@ -66,6 +66,7 @@ AC_DEFUN([ISL_INIT_FLAGS], isllibs='-L$$r/$(HOST_SUBDIR)/isl/'"$lt_cv_objdir"' ' islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include' ENABLE_ISL_CHECK=no + AC_MSG_WARN([using in-tree ISL, disabling version check]) fi ] ) @@ -113,14 +114,13 @@ AC_DEFUN([ISL_CHECK_VERSION], CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" LIBS="${_isl_saved_LIBS} -lisl" - echo $CFLAGS - AC_CACHE_CHECK([for version $1.$2 of ISL], - [gcc_cv_isl], - [AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], + AC_MSG_CHECKING([for version $1.$2 of ISL]) + AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)], [gcc_cv_isl=yes], [gcc_cv_isl=no], - [gcc_cv_isl=yes])]) + [gcc_cv_isl=yes]) + AC_MSG_RESULT([$gcc_cv_isl]) CFLAGS=$_isl_saved_CFLAGS LDFLAGS=$_isl_saved_LDFLAGS |