diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.ac | 9 |
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) ;; |