diff options
| author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-02 18:34:24 +0000 |
|---|---|---|
| committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-01-02 18:34:24 +0000 |
| commit | 9c19a7461cdc52b9f320abdf7db980c3efdb16a5 (patch) | |
| tree | c8ac67acca9e88b1a6a620a71db014d69adbedf1 | |
| parent | dbf080159174614addc3bbedd0ce0d80b977f489 (diff) | |
| download | gcc-9c19a7461cdc52b9f320abdf7db980c3efdb16a5.tar.gz | |
* configure.in: When reconfiguring remove Makefile in
all stage directories.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109240 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.in | 13 |
3 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index d868bfecfa6..9539f618134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-02 Andreas Schwab <schwab@suse.de> + + * configure.in: When reconfiguring remove Makefile in + all stage directories. + * configure: Regenerate. + 2005-12-27 Steven Bosscher <stevenb.gcc@gmail.com> * MAINTAINERS: Update my email address. diff --git a/configure b/configure index 9ff20106169..cadb668dd79 100755 --- a/configure +++ b/configure @@ -3012,10 +3012,13 @@ for module in ${build_configdirs} ; do /^@endif build-$module-$bootstrap_suffix\$/d" done for module in ${configdirs} ; do - if test -z "${no_recursion}" \ - && test -f ${module}/Makefile; then - echo 1>&2 "*** removing ${module}/Makefile to force reconfigure" - rm -f ${module}/Makefile + if test -z "${no_recursion}"; then + for file in stage*-${module}/Makefile ${module}/Makefile; do + if test -f ${file}; then + echo 1>&2 "*** removing ${file} to force reconfigure" + rm -f ${file} + fi + done fi extrasub="$extrasub /^@if $module\$/d diff --git a/configure.in b/configure.in index ad7ec4d9a4d..c3ef95b9ec2 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1802,10 +1802,13 @@ for module in ${build_configdirs} ; do /^@endif build-$module-$bootstrap_suffix\$/d" done for module in ${configdirs} ; do - if test -z "${no_recursion}" \ - && test -f ${module}/Makefile; then - echo 1>&2 "*** removing ${module}/Makefile to force reconfigure" - rm -f ${module}/Makefile + if test -z "${no_recursion}"; then + for file in stage*-${module}/Makefile ${module}/Makefile; do + if test -f ${file}; then + echo 1>&2 "*** removing ${file} to force reconfigure" + rm -f ${file} + fi + done fi extrasub="$extrasub /^@if $module\$/d |