From 19361834df80840fa7cfb189d502118248904c88 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Tue, 5 Oct 2004 21:51:13 +0000 Subject: [PATCH] re PR bootstrap/17817 (restage[1,2,3] and then bootstrap no longer cause build dir to be rebuilt) 2004-10-05 Kelley Cook PR bootstrap/17817 * Makefile.in: Stage the build directory too. From-SVN: r88577 --- gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9c98af66184..327be6c7d6f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-10-05 Kelley Cook + + PR bootstrap/17817 + * Makefile.in: Stage the build directory too. + 2004-10-05 Aldy Hernandez * config/frv/frv.h (LEGITIMIZE_ADDRESS): New. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 7bff6d5389a..2ac670f1d3a 100644 --- 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. -- 2.30.2