This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] Fail when PPL 0.11 is not present and CLooG has been requested.
On Tue, Jan 25, 2011 at 08:10:24AM -0800, Ian Lance Taylor wrote:
> Good point.
>
> I'll preapprove a patch which moves with_cloog=no and fixes
> CLOOG_REQUESTED, assuming it bootstraps.
This is what bootstrapped on i686-linux and is almost all the way through
bootstrap on x86_64-linux too:
2011-01-25 Jakub Jelinek <jakub@redhat.com>
* config/cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog.
* configure.ac: If with_ppl is no, move setting with_cloog=no
after CLOOG_REQUESTED check.
* configure: Regenerated.
--- config/cloog.m4.jj 2010-11-20 00:43:01.000000000 +0100
+++ config/cloog.m4 2011-01-25 17:10:42.424433767 +0100
@@ -88,7 +88,9 @@ AC_DEFUN([CLOOG_REQUESTED],
[
AC_REQUIRE([CLOOG_INIT_FLAGS])
- if test "x${with_cloog}" != x \
+ if test "x${with_cloog}" = xno; then
+ $2
+ elif test "x${with_cloog}" != x \
|| test "x${with_cloog_include}" != x \
|| test "x${with_cloog_lib}" != x ; then
$1
--- configure.ac.jj 2011-01-25 12:58:42.000000000 +0100
+++ configure.ac 2011-01-25 17:14:12.020482227 +0100
@@ -1688,13 +1688,12 @@ dnl Provide configure switches and initi
dnl with user input.
CLOOG_INIT_FLAGS
if test "x$with_ppl" = "xno"; then
- with_cloog=no
-
dnl Only execute fail-action, if CLooG has been requested.
CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no])
if test "${graphite_requested}" = yes; then
AC_MSG_ERROR([Unable to find a usable PPL. See config.log for details.])]
fi
+ with_cloog=no
fi
if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
&& test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then
--- configure.jj 2011-01-25 12:58:42.000000000 +0100
+++ configure 2011-01-25 17:15:10.141523329 +0100
@@ -5817,12 +5817,12 @@ fi
if test "x$with_ppl" = "xno"; then
- with_cloog=no
-
- if test "x${with_cloog}" != x \
+ if test "x${with_cloog}" = xno; then
+ graphite_requested=no
+ elif test "x${with_cloog}" != x \
|| test "x${with_cloog_include}" != x \
|| test "x${with_cloog_lib}" != x ; then
graphite_requested=yes
@@ -5834,6 +5834,7 @@ if test "x$with_ppl" = "xno"; then
if test "${graphite_requested}" = yes; then
as_fn_error "Unable to find a usable PPL. See config.log for details." "$LINENO" 5]
fi
+ with_cloog=no
fi
if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
&& test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then
@@ -6085,7 +6086,9 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6;
- if test "x${with_cloog}" != x \
+ if test "x${with_cloog}" = xno; then
+ graphite_requested=no
+ elif test "x${with_cloog}" != x \
|| test "x${with_cloog_include}" != x \
|| test "x${with_cloog_lib}" != x ; then
graphite_requested=yes
Jakub