From 2b2d7c53bb77d296530b792df31559ebca3cdb9b Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@adacore.com>
Date: Wed, 4 Jul 2012 12:26:55 +0000
Subject: [PATCH] isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling.
config/
2012-07-04 Tristan Gingold <gingold@adacore.com>
* isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling.
Fix comments.
2012-07-04 Tristan Gingold <gingold@adacore.com>
* configure: Regenerate.
From-SVN: r189257
---
ChangeLog | 4 ++++
config/ChangeLog | 5 +++++
config/isl.m4 | 7 ++++---
configure | 5 +----
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f318d48b2e83..b0ec2914446b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-04 Tristan Gingold <gingold@adacore.com>
+
+ * configure: Regenerate.
+
2012-07-03 Richard Guenther <rguenther@suse.de>
* Makfile.def (isl): Remove not necessary extra_exports and
diff --git a/config/ChangeLog b/config/ChangeLog
index 3408a523cf2d..3b58790df999 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-04 Tristan Gingold <gingold@adacore.com>
+
+ * isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling.
+ Fix comments.
+
2012-07-03 Richard Guenther <rguenther@suse.de>
* cloog.m4: Remove debugging print.
diff --git a/config/isl.m4 b/config/isl.m4
index 152d422ef908..4f397246e2e6 100644
--- a/config/isl.m4
+++ b/config/isl.m4
@@ -84,7 +84,7 @@ AC_DEFUN([ISL_INIT_FLAGS],
# ISL_REQUESTED (ACTION-IF-REQUESTED, ACTION-IF-NOT)
# ----------------------------------------------------
-# Provide actions for failed CLooG detection.
+# Provide actions for failed ISL detection.
AC_DEFUN([ISL_REQUESTED],
[
AC_REQUIRE([ISL_INIT_FLAGS])
@@ -103,7 +103,7 @@ AC_DEFUN([ISL_REQUESTED],
# _ISL_CHECK_CT_PROG(MAJOR, MINOR)
# --------------------------------------------
-# Helper for verifying CLooG's compile time version.
+# Helper for verifying ISL compile time version.
m4_define([_ISL_CHECK_CT_PROG],[AC_LANG_PROGRAM(
[#include <isl/version.h>
#include <string.h>],
@@ -131,7 +131,8 @@ AC_DEFUN([ISL_CHECK_VERSION],
[gcc_cv_isl],
[AC_RUN_IFELSE([_ISL_CHECK_CT_PROG($1,$2)],
[gcc_cv_isl=yes],
- [gcc_cv_isl=no])])
+ [gcc_cv_isl=no],
+ [gcc_cv_isl=yes])])
CFLAGS=$_isl_saved_CFLAGS
LDFLAGS=$_isl_saved_LDFLAGS
diff --git a/configure b/configure
index 62f006c6ecab..9976d0d95bf1 100755
--- a/configure
+++ b/configure
@@ -5702,10 +5702,7 @@ if test "${gcc_cv_isl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
+ gcc_cv_isl=yes
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--
GitLab