Tiny bugfix for makeinfo.

[binutils.git] / test-build.mk

diff --git a/test-build.mk b/test-build.mk
index 8502237c86015e73f1890178ec39d297823e24a8..b5610bdca2fdf928d1804b13e183cb34fda1cc7c 100644 (file)
--- a/test-build.mk
+++ b/test-build.mk
@@ -48,7 +48,7 @@ release_root := $(ROOTING)/$(RELEASE_TAG)
 
 TIME := time
 GCC := gcc -O
-GNU_MAKE := /usr/latest/bin/make -f test-build.mk
+GNU_MAKE := /usr/latest/bin/make
 override MAKE := make
 override MAKEFLAGS :=
 override MFLAGS :=
@@ -80,9 +80,8 @@ $(host)-stamp-in-place: $(TREE)-stamp-co
        PATH=/bin:/usr/bin:/usr/ucb ; \
                export PATH ; \
                SHELL=/bin/sh ; export SHELL ; \
-               $(TIME) $(GNU_MAKE) $(host)-stamp-in-place-installed host=$(host) $(FLAGS_TO_PASS)
+               $(TIME) $(GNU_MAKE) -f test-build.mk $(host)-stamp-in-place-installed host=$(host) $(FLAGS_TO_PASS)
        touch $@
-       mv $(INPLACEDIR) $(STAGE1DIR)
 
 $(host)-stamp-in-place-installed: $(host)-stamp-in-place-checked
        (cd $(INPLACEDIR) ; $(TIME) $(MAKE) $(MF) install host=$(host))
@@ -123,7 +122,7 @@ $(host)-stamp-stage1:
        PATH=`pwd`/$(HOLESDIR) ; \
                export PATH ; \
                SHELL=sh ; export SHELL ; \
-               $(TIME) $(GNU_MAKE) $(host)-stamp-stage1-installed host=$(host) $(FLAGS_TO_PASS)
+               $(TIME) $(GNU_MAKE) -f test-build.mk $(host)-stamp-stage1-installed host=$(host) $(FLAGS_TO_PASS)
        touch $@
        mv $(WORKING_DIR) $(STAGE1DIR)
 
@@ -161,7 +160,7 @@ $(host)-stamp-stage2:
        PATH=$(release_root)/H-$(host)/bin:`pwd`/$(HOLESDIR) ; \
                export PATH ; \
                SHELL=sh ; export SHELL ; \
-               $(TIME) $(MAKE) -w $(STAGE2DIR) host=$(host) $(FLAGS_TO_PASS)
+               $(TIME) $(MAKE) -f test-build.mk -w $(STAGE2DIR) host=$(host) $(FLAGS_TO_PASS)
        touch $@
 
 $(STAGE2DIR): $(host)-stamp-stage2-installed
@@ -193,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
@@ -272,6 +275,7 @@ HOLES := \
        touch \
        tr \
        true \
+       wc \
        whoami
 
 ### so far only sun make supports VPATH
@@ -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
@@ -367,7 +379,7 @@ clean:
 
 .PHONY: very
 very:
-       rm -rf $(TREE)
+       rm -rf $(TREE)  $(TREE)-stamp-co
 
 .PHONY: $(TREE)
 $(TREE): $(TREE)-stamp-co