summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@google.com>2011-07-26 18:44:11 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2011-07-26 18:44:11 +0000
commitbf03b9ffeca63804bbdaafe308279b42caa0e2be (patch)
tree2f153be45922d17bc5bb0a5852e47d6bfa8d2456
parente207e41f47355476c36f5833796e62dcdeab1482 (diff)
downloadgcc-bf03b9ffeca63804bbdaafe308279b42caa0e2be.tar.gz
configure.ac: Set have_compiler based on whether gcc directory exists...
* configure.ac: Set have_compiler based on whether gcc directory exists, rather than on whether gcc is in configdirs. * configure: Rebuild. From-SVN: r176800
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure9
-rw-r--r--configure.ac9
3 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a27fb72e70..2b062ccdb16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-26 Ian Lance Taylor <iant@google.com>
+
+ * configure.ac: Set have_compiler based on whether gcc directory
+ exists, rather than on whether gcc is in configdirs.
+ * configure: Rebuild.
+
2011-07-21 Joseph Myers <joseph@codesourcery.com>
* MAINTAINERS (Global Reviewers): Add self.
diff --git a/configure b/configure
index facf3e4781e..5366d713e0b 100755
--- a/configure
+++ b/configure
@@ -4992,10 +4992,11 @@ fi
# Issue errors and warnings for invalid/strange bootstrap combinations.
-case "$configdirs" in
- *gcc*) have_compiler=yes ;;
- *) have_compiler=no ;;
-esac
+if test -r $srcdir/gcc/configure; then
+ have_compiler=yes
+else
+ have_compiler=no
+fi
case "$have_compiler:$host:$target:$enable_bootstrap" in
*:*:*:no) ;;
diff --git a/configure.ac b/configure.ac
index e64e5775f13..4cf11607365 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1139,10 +1139,11 @@ AC_ARG_ENABLE([bootstrap],
enable_bootstrap=default)
# Issue errors and warnings for invalid/strange bootstrap combinations.
-case "$configdirs" in
- *gcc*) have_compiler=yes ;;
- *) have_compiler=no ;;
-esac
+if test -r $srcdir/gcc/configure; then
+ have_compiler=yes
+else
+ have_compiler=no
+fi
case "$have_compiler:$host:$target:$enable_bootstrap" in
*:*:*:no) ;;