diff options
| author | Kelley Cook <kelleycook@wideopenwest.com> | 2003-09-09 22:19:56 +0000 |
|---|---|---|
| committer | R. Kelley Cook <kcook@gcc.gnu.org> | 2003-09-09 22:19:56 +0000 |
| commit | 7f5cc0f3d0f719d5ecf4ad0e368a4449a3cd9e00 (patch) | |
| tree | 42b16678ee76e091161e75cd3a054eb82897f8ec /gcc | |
| parent | f7657db990578e6193922cc0a4f8969c1bef368a (diff) | |
| download | gcc-7f5cc0f3d0f719d5ecf4ad0e368a4449a3cd9e00.zip gcc-7f5cc0f3d0f719d5ecf4ad0e368a4449a3cd9e00.tar.gz gcc-7f5cc0f3d0f719d5ecf4ad0e368a4449a3cd9e00.tar.bz2 | |
Makefile.in: Define REMAKEFLAGS for LANGUAGES & BOOT_CFLAGS and use it throughout.
* Makefile.in: Define REMAKEFLAGS for LANGUAGES & BOOT_CFLAGS
and use it throughout.
From-SVN: r71253
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 33 |
2 files changed, 22 insertions, 16 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cbffdfc..5527661 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2003-09-07 Kelley Cook <kelleycook@wideopenwest.com> + + * Makefile.in: Define REMAKEFLAGS for LANGUAGES & BOOT_CFLAGS + and use it throughout. + 2003-09-09 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * builtins.c (real_dconstp, fold_builtin_logarithm, diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 44add3f..1738b39 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -223,6 +223,7 @@ STAMP = echo timestamp > # Make sure the $(MAKE) variable is defined. @SET_MAKE@ +REMAKEFLAGS=LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" # -------- # UNSORTED @@ -3468,22 +3469,22 @@ unstage1 unstage2 unstage3 unstage4 unstageprofile unstagefeedback: echo $${stage}_build > stage_last restage1: unstage1 - $(MAKE) stage1_build + $(MAKE) $(REMAKEFLAGS) stage1_build restage2: unstage2 - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage2_build + $(MAKE) $(REMAKEFLAGS) stage2_build restage3: unstage3 - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage3_build + $(MAKE) $(REMAKEFLAGS) stage3_build restage4: unstage4 - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage4_build + $(MAKE) $(REMAKEFLAGS) stage4_build restageprofile: unstageprofile - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stageprofile_build + $(MAKE) $(REMAKEFLAGS) stageprofile_build restagefeedback: unstagefeedback - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stagefeedback_build + $(MAKE) $(REMAKEFLAGS) stagefeedback_build # Bubble up a bugfix through all the stages. Primarily useful for fixing # bugs that cause the compiler to crash while building stage 2. @@ -3491,31 +3492,31 @@ bubblestrap: if test -f stage_last; then \ LAST=`sed -e 's/_build//' < stage_last`; \ if test "$$LAST" != "stage1"; then \ - $(MAKE) $$LAST; \ + $(MAKE) $(REMAKEFLAGS) $$LAST; \ $(STAMP) $${LAST}_copy; \ fi; \ fi if test -f stage1_copy; then $(MAKE) unstage1; fi - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage1_copy + $(MAKE) $(REMAKEFLAGS) stage1_copy if test -f stage2_copy; then $(MAKE) unstage2; fi - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage2_copy + $(MAKE) $(REMAKEFLAGS) stage2_copy if test -f stage3_copy; then $(MAKE) unstage3; fi - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage3_build + $(MAKE) $(REMAKEFLAGS) stage3_build if test -f stage4_copy; then \ - $(MAKE) stage3_copy; $(MAKE) unstage4; \ - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" stage4_build || exit 1; \ + $(MAKE) $(REMAKEFLAGS) stage3_copy; $(MAKE) unstage4; \ + $(MAKE) $(REMAKEFLAGS) stage4_build || exit 1; \ fi quickstrap: if test -f stage_last ; then \ - LAST=`cat stage_last`; rm $$LAST; $(MAKE) BOOT_CFLAGS="$(BOOT_CFLAGS)" LANGUAGES="$(LANGUAGES)" $$LAST; \ + LAST=`cat stage_last`; rm $$LAST; $(MAKE) $(REMAKEFLAGS) $$LAST; \ else \ - $(MAKE) stage1_build; \ + $(MAKE) $(REMAKEFLAGS) stage1_build; \ fi cleanstrap: -$(MAKE) clean - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" bootstrap + $(MAKE) $(REMAKEFLAGS) bootstrap unstrap: -rm -rf stage[234]* @@ -3526,7 +3527,7 @@ unstrap: # not from scratch. restrap: $(MAKE) unstrap - $(MAKE) LANGUAGES="$(LANGUAGES)" BOOT_CFLAGS="$(BOOT_CFLAGS)" bootstrap + $(MAKE) $(REMAKEFLAGS) bootstrap # Compare the object files in the current directory with those in the # stage2 directory. |