From 361e618f2534e872d7ec4c35435b18423daadc8b Mon Sep 17 00:00:00 2001 From: Manfred Hollstein Date: Sun, 26 Oct 1997 18:45:07 +0000 Subject: [PATCH] Makefile.in (bootstrap-lean): Combined with `normal' bootstrap targets using "$@" to provide support for... * Makefile.in (bootstrap-lean): Combined with `normal' bootstrap targets using "$@" to provide support for similar but not identical targets without having to duplicate code. (bootstrap4): New goal. From-SVN: r16187 --- gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 22 +++++----------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0cd65dc9898..5533987acd9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ Sun Oct 26 11:32:16 1997 Manfred Hollstein + * Makefile.in (bootstrap-lean): Combined with `normal' bootstrap + targets using "$@" to provide support for similar but not identical + targets without having to duplicate code. + (bootstrap4): New goal. + * Makefile.in (compare, compare-lean, compare3): Combined to one ruleset determining actions to be performed via $@. (compare4, compare4-lean): New targets. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 2f72f750499..1188c2d4676 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2574,7 +2574,7 @@ diff: $(LANG_DIFF_EXCLUDES) \ gcc-$(oldversion) gcc-$(version) > diffs -bootstrap: force +bootstrap bootstrap-lean: force # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the # only thing useful for building stage2. @@ -2587,22 +2587,7 @@ bootstrap: force # alloca.o. Then cc1 is newer, so it won't have to be relinked. $(MAKE) CC="stage1/xgcc -Bstage1/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) STAGE_PREFIX=stage1/ LANGUAGES="$(LANGUAGES)" $(MAKE) stage2 - $(MAKE) CC="stage2/xgcc -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) STAGE_PREFIX=stage2/ LANGUAGES="$(LANGUAGES)" - -bootstrap-lean: force -# Only build the C compiler for stage1, because that is the only one that -# we can guarantee will build with the native compiler, and also it is the -# only thing useful for building stage2. - $(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" - $(MAKE) stage1 -# This used to define ALLOCA as empty, but that would lead to bad results -# for a subsequent `make install' since that would not have ALLOCA empty. -# To prevent `make install' from compiling alloca.o and then relinking cc1 -# because alloca.o is newer, we permit these recursive makes to compile -# alloca.o. Then cc1 is newer, so it won't have to be relinked. - $(MAKE) CC="stage1/xgcc -Bstage1/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) STAGE_PREFIX=stage1/ LANGUAGES="$(LANGUAGES)" - $(MAKE) stage2 - rm -rf stage1 + -if test $@ = bootstrap-lean; then rm -rf stage1; else true; fi $(MAKE) CC="stage2/xgcc -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) STAGE_PREFIX=stage2/ LANGUAGES="$(LANGUAGES)" bootstrap2: force @@ -2613,6 +2598,9 @@ bootstrap2: force bootstrap3: force $(MAKE) CC="stage2/xgcc -Bstage2/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) STAGE_PREFIX=stage2/ LANGUAGES="$(LANGUAGES)" +bootstrap4: force + $(MAKE) CC="stage3/xgcc -Bstage3/" CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(BOOT_LDFLAGS)" libdir=$(libdir) STAGE_PREFIX=stage3/ LANGUAGES="$(LANGUAGES)" + # Compare the object files in the current directory with those in the # stage2 directory. -- 2.30.2