diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2008-04-18 10:57:44 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2008-04-18 10:57:44 +0000 |
| commit | 7142fb32472b5c68d126d194755e49dfa52b776b (patch) | |
| tree | 31e526b6e23733275a953709ec1d726e679d75b7 | |
| parent | deb984e6de1e28d0b72d2b7c407c307e47541aeb (diff) | |
| download | gcc-7142fb32472b5c68d126d194755e49dfa52b776b.zip gcc-7142fb32472b5c68d126d194755e49dfa52b776b.tar.gz gcc-7142fb32472b5c68d126d194755e49dfa52b776b.tar.bz2 | |
re PR other/35457 (Error building GCC trunk on CELL SPU)
2008-04-18 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/35457
* configure.ac: Include override.m4.
* configure: Regenerate.
From-SVN: r134435
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 21 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 23 insertions, 7 deletions
@@ -1,5 +1,11 @@ 2008-04-18 Paolo Bonzini <bonzini@gnu.org> + PR bootstrap/35457 + * configure.ac: Include override.m4. + * configure: Regenerate. + +2008-04-18 Paolo Bonzini <bonzini@gnu.org> + * Makefile.tpl (restrap): Call `make all' using double-colon rules. * Makefile.in: Regenerate. @@ -1415,13 +1415,22 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: + else + { echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +echo "$as_me: former value: \`$ac_old_val'" >&2;} + { echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. diff --git a/configure.ac b/configure.ac index ccb6240..c96f630 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,8 @@ ############################################################################## ### WARNING: this file contains embedded tabs. Do not run untabify on this file. -sinclude(config/acx.m4) +m4_include(config/acx.m4) +m4_include(config/override.m4) m4_include(config/proginstall.m4) AC_INIT(move-if-change) |