re PR bootstrap/17817 (restage[1,2,3] and then bootstrap no longer cause build dir...

2004-10-05  Kelley Cook  <kcook@gcc.gnu.org>

	PR bootstrap/17817
	* Makefile.in: Stage the build directory too.

From-SVN: r88577

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9c98af6618486e3e57ece09fc75f29a4130f48b2..327be6c7d6fda3e3d1a4d385440457fd967c1ebe 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-05  Kelley Cook  <kcook@gcc.gnu.org>
+
+       PR bootstrap/17817
+       * Makefile.in: Stage the build directory too.
+
 2004-10-05  Aldy Hernandez  <aldyh@redhat.com>
 
        * config/frv/frv.h (LEGITIMIZE_ADDRESS): New.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7bff6d5389af0cfec5c0ffd7dd5d38a53d92eb81..2ac670f1d3aed067e2a9c6446751036c09f8cf71 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -119,7 +119,7 @@ T_ADAFLAGS =
 # See below for how to change them for certain systems.
 
 # List of language subdirectories.
-SUBDIRS =@subdirs@
+SUBDIRS =@subdirs@ build
 
 # Selection of languages to be made.
 CONFIG_LANGUAGES = @all_languages@
@@ -3899,6 +3899,7 @@ stage1-start:
 # If SPECS is overridden, make sure it is `installed' as specs.
        -mv $(SPECS) stage1/specs
        -mv $(STAGEMOVESTUFF) stage1
+       -mv build/* stage1/build
        -cp -p $(STAGECOPYSTUFF) stage1
 # Copy as/ld if they exist to stage dir, so that running xgcc from the stage
 # dir will work properly.
@@ -3937,6 +3938,7 @@ stage2-start:
 # If SPECS is overridden, make sure it is `installed' as specs.
        -mv $(SPECS) stage2/specs
        -mv $(STAGEMOVESTUFF) stage2
+       -mv build/* stage2/build
        -cp -p $(STAGECOPYSTUFF) stage2
 # Copy as/ld if they exist to stage dir, so that running xgcc from the stage
 # dir will work properly.
@@ -3971,6 +3973,7 @@ stage3-start:
 # If SPECS is overridden, make sure it is `installed' as specs.
        -mv $(SPECS) stage3/specs
        -mv $(STAGEMOVESTUFF) stage3
+       -mv build/* stage3/build
        -cp -p $(STAGECOPYSTUFF) stage3
 # Copy as/ld if they exist to stage dir, so that running xgcc from the stage
 # dir will work properly.
@@ -4005,6 +4008,7 @@ stage4-start:
 # If SPECS is overridden, make sure it is `installed' as specs.
        -mv $(SPECS) stage4/specs
        -mv $(STAGEMOVESTUFF) stage4
+       -mv build/* stage4/build
        -cp -p $(STAGECOPYSTUFF) stage4
 # Copy as/ld if they exist to stage dir, so that running xgcc from the stage
 # dir will work properly.
@@ -4037,6 +4041,7 @@ stageprofile-start:
           if [ -d stageprofile/$$dir ] ; then true ; else mkdir stageprofile/$$dir ; fi ; \
         done
        -mv $(STAGEMOVESTUFF) stageprofile
+       -mv build/* stageprofile/build
        -cp -p $(STAGECOPYSTUFF) stageprofile
 # Copy as/ld if they exist to stage dir, so that running xgcc from the stage
 # dir will work properly.
@@ -4069,6 +4074,7 @@ stagefeedback-start:
           if [ -d stagefeedback/$$dir ] ; then true ; else mkdir stagefeedback/$$dir ; fi ; \
         done
        -mv $(STAGEMOVESTUFF) stagefeedback
+       -mv build/* stagefeedback/build
        -cp -p $(STAGECOPYSTUFF) stagefeedback
 # Copy as/ld if they exist to stage dir, so that running xgcc from the stage
 # dir will work properly.