predicate stage3 and comparison on the existence of gcc

diff --git a/ChangeLog b/ChangeLog
index 8025a72124c87f3d256dbc2047842b9338b5ac7d..7a7813f40bb61b1342f0ef7e43462bf9dfa8a67a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 Fri Jul 17 22:52:49 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
 
        * test-build.mk: recurse explicitly with -f test-build.mk when
-         appropriate.
+         appropriate.  predicate stage3 and comparison on the existence
+         of gcc.  That is, if gcc isn't around, we aren't three-staging.
 
 Thu Jul 16 18:33:09 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 

diff --git a/test-build.mk b/test-build.mk
index 946cffa13088c4d250efa3e7097ed67257d387cb..bd8884def391c4ba9be1ea125abe79a4e6066c05 100644 (file)
--- a/test-build.mk
+++ b/test-build.mk
@@ -192,15 +192,19 @@ $(host)-stamp-stage2-configured:
 do3:   $(HOLESDIR) $(host)-stamp-stage3
 
 $(host)-stamp-stage3:
-       if [ -d $(STAGE3DIR) ] ; then \
-               mv $(STAGE3DIR) $(WORKING_DIR) ; \
+       if [ -d $(TREE)/gcc ] ; then \
+               if [ -d $(STAGE3DIR) ] ; then \
+                       mv $(STAGE3DIR) $(WORKING_DIR) ; \
+               else \
+                       true ; \
+               fi ; \
+               PATH=$(release_root)/H-$(host)/bin:`pwd`/$(HOLESDIR) ; \
+                       export PATH ; \
+                       SHELL=sh ; export SHELL ; \
+                       $(TIME) $(MAKE) -f test-build.mk -w $(STAGE3DIR) host=$(host) $(FLAGS_TO_PASS) ; \
        else \
                true ; \
        fi
-       PATH=$(release_root)/H-$(host)/bin:`pwd`/$(HOLESDIR) ; \
-               export PATH ; \
-               SHELL=sh ; export SHELL ; \
-               $(TIME) $(MAKE) -w $(STAGE3DIR) host=$(host) $(FLAGS_TO_PASS)
        touch $@
 
 $(STAGE3DIR): $(host)-stamp-stage3-checked
@@ -350,15 +354,23 @@ $(host)-stamp-holes:
 .PHONY: comparison
 comparison:
 ifeq ($(subst rs6000,iris4,$(subst decstation,iris4,$(host))),iris4)
-       for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
-               tail +10c $(STAGE2DIR)/$$i > foo1 ; \
-               tail +10c $(STAGE3DIR)/$$i > foo2 ; \
-               cmp foo1 foo2 || echo $$i ; \
-       done
+       if [ -d $(TREE)/gcc ] ; then \
+               for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
+                       tail +10c $(STAGE2DIR)/$$i > foo1 ; \
+                       tail +10c $(STAGE3DIR)/$$i > foo2 ; \
+                       cmp foo1 foo2 || echo $$i ; \
+               done ; \
+       else \
+               true ; \
+       fi
 else
-       for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
-               cmp $(STAGE2DIR)/$$i $(STAGE3DIR)/$$i ; \
-       done
+       if [ -d $(TREE)/gcc ] ; then \
+               for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
+                       cmp $(STAGE2DIR)/$$i $(STAGE3DIR)/$$i ; \
+               done ; \
+       else \
+               true ; \
+       fi
 endif
 
 .PHONY: clean