X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=test-build.mk;h=e5dc1abe5a8aab4ef52f5e4ca865248b83c3d7f3;hb=c3cbe3f4591f615fc873349a73b290e053b196b7;hp=43338e391e1766b364e9e9d231812fabcdc43700;hpb=c12d9b4c66bc9e1607842175e73851d1d03d1f13;p=deliverable%2Fbinutils-gdb.git

diff --git a/test-build.mk b/test-build.mk
index 43338e391e..e5dc1abe5a 100644
--- a/test-build.mk
+++ b/test-build.mk
@@ -3,76 +3,386 @@
 ### compile other bundles, first with cc, then with gcc.
 ###
 
-### This file was written and is maintained by K. Richard Pixley,
-### <rich@cygnus.com>.
+###
+### USE OF THIS FILE REQUIRES GNU MAKE!!!
+###
+
+### The first versions of the file were written by Rich Pixley (rich@cygnus.com).
+### Many subsequent additions (and current maintainance by) david d `zoo' zuhn,
+### (zoo@cygnus.com).
 
 ### Every invocation of this Makefile needs to have a variable set (host), 
 ### which is the named used for ./configure, and also the prefix for the
 ### various files and directories used in a three stage.
 
+### The variable target may be set for the target of a cross-compilation.
+
+### The variable build may be to build a tree on a machine other than the host.
+
 ifndef host
-error:; @echo You must set the variable \"host\" to use this Makefile ; exit 1
+error:
+	@echo You must set the variable \"host\" to use this Makefile ; exit 1
 else
 
 ### from here to very near the end of the file is the real guts of this 
 ### Makefile, and it is not seen if the variable 'host' is not set 
 
-###
-### START EDITTING HERE!!!
-### These things will need to be set differently for each release.
-###
-
 ### from which cvs tree are we working?
-TREE := progressive
+TREE := devo
+
+include $(TREE)/release-info
+
+
+TIME 		:= time
+GCC 		:= $(host)-gcc -O
+GNUC		:= CC="$(GCC)"
+CFLAGS		:= -g
+CXXFLAGS	:= -g -O
+GNU_MAKE 	:= /usr/latest/bin/make -w 
+MAKEINFOFLAGS	:=
 
-### binaries should be installed into?
-ROOTING := /usr/cygnus
+override MAKE 		:= make
+override MFLAGS 	:=
+#override MAKEFLAGS 	:=
 
-### When working from a tagged set of source, this should be the tag.  If not,
-### then set the macro to be empty.
-CVS_TAG := -r emacs-920529
+SHELL := /bin/sh
 
-### The name of the cvs module for this release.  The intersection of
-### CVS_MODULE and CVS_TAG defines the source files in this release.
-CVS_MODULE := progressive-emacs
+ifndef build
+build := $(host)
+endif
 
-### Historically, this was identical to CVS_TAG.  This is changing.
-RELEASE_TAG := progressive-920529
+ifndef target
+target := $(host)
+endif
 
-### Historically, binaries were installed here.  This is changing.
-release_root := $(ROOTING)/$(RELEASE_TAG)
+ifneq ($(build),$(host))
+
+# We are building on a machine other than the host.  We rely upon
+# previously built cross-compilers from the build machine to the host
+# (used to build the executables) and from the build machine to the
+# target (used to build the libraries).
+
+AR		:= $(host)-ar
+AR_FOR_TARGET	:= $(target)-ar
+AS		:= $(host)-as
+AS_FOR_TARGET	:= $(target)-as
+CC		:= $(host)-gcc
+CC_FOR_BUILD	:= gcc
+CC_FOR_TARGET	:= $(target)-gcc
+CXX		:= $(host)-c++
+CXX_FOR_TARGET	:= $(target)-c++
+GCC		:= $(host)-gcc -O
+GXX		:= $(host)-g++
+GXX_FOR_TARGET	:= $(target)-g++
+HOST_PREFIX	:= $(build)-
+HOST_PREFIX_1	:= $(build)-
+MAKEINFO	:= makeinfo
+MUNCH_NM	:= $(host)-nm
+NM		:= $(host)-nm
+NM_FOR_TARGET	:= $(target)-nm
+RANLIB		:= $(host)-ranlib
+RANLIB_FOR_TARGET	:= $(target)-ranlib
 
-### STOP EDITTING HERE!!!
-### With luck, eventually, nothing else will need to be editted.
+FLAGS_TO_PASS := \
+	"AR=$(AR)" \
+	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
+	"AS=$(AS)" \
+	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
+	"CC=$(CC)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+	"CXX=$(CXX)" \
+	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"GCC=$(GCC)" \
+	"HOST_PREFIX=$(HOST_PREFIX)" \
+	"HOST_PREFIX_1=$(HOST_PREFIX_1)" \
+	"MAKEINFO=$(MAKEINFO)" \
+	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
+	"MF=$(MF)" \
+	"MUNCH_NM=$(MUNCH_NM)" \
+	"NM=$(NM)" \
+	"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
+	"RANLIB=$(RANLIB)" \
+	"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
+	"RELEASE_TAG=$(RELEASE_TAG)" \
+	"TIME=$(TIME)" \
+	"build=$(build)" \
+	"host=$(host)"
 
-TIME := time
-GCC := gcc -O
-GNU_MAKE := /usr/latest/bin/make
-override MAKE := make
-override MAKEFLAGS :=
-override MFLAGS :=
+# We must pass the build cross host tools in the environment of
+# configure, so that autoconf scripts will run the right programs.
+configenv := AR="$(AR)" CC="$(CC)" RANLIB="$(RANLIB)"
 
-SHELL := /bin/sh
+else
 
-.NOEXPORT:
+# This is a normal build on the host machine.
 
 FLAGS_TO_PASS := \
 	"GCC=$(GCC)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
 	"TIME=$(TIME)" \
-	"MF=$(MF)"
+	"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
+	"MF=$(MF)" \
+	"host=$(host)" \
+	"RELEASE_TAG=$(RELEASE_TAG)"
+
+ifneq  '$(CC)' 'cc'
+FLAGS_TO_PASS := "CC=$(CC)" $(FLAGS_TO_PASS)
+endif
+
+configenv :=
+
+endif
+
+
+# These are the prefixes used for Cygnus builds.
+prefixes	= --prefix=$(release_root) --exec-prefix=$(release_root)/H-$(host)
+
+relbindir	= $(release_root)/H-$(host)/bin
 
 ### general config stuff
-WORKING_DIR := $(host)-objdir
-STAGE1DIR := $(WORKING_DIR).1
-STAGE2DIR := $(WORKING_DIR).2
-STAGE3DIR := $(WORKING_DIR).3
-HOLESDIR := $(host)-holes
+WORKING_DIR 	:= $(host)-objdir
+STAGE1DIR 	:= $(WORKING_DIR).1
+STAGE2DIR 	:= $(WORKING_DIR).2
+STAGE3DIR 	:= $(WORKING_DIR).3
+INPLACEDIR 	:= $(host)-in-place
+
+# Arrange to find the needed programs.  If we are building on a
+# machine other than the host, we must find the cross-compilers.
+
+ifneq ($(build),$(host))
+
+holesys		:= $(build)
+HOLESSTAMP	:= $(holesys)-stamp-holes $(build)-x-$(host)-stamp-holes $(build)-x-$(target)-stamp-holes
+HOLESDIR 	:= $(holesys)-holes
+BUILD_HOST_HOLES_DIR	:= $(build)-x-$(host)-holes
+BUILD_TARGET_HOLES_DIR	:= $(build)-x-$(target)-holes
+
+SET_NATIVE_HOLES := SHELL=sh ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_CYGNUS_PATH  := SHELL=sh ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+SET_LATEST_PATH  := SHELL=sh ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ;
+
+else
+
+holesys		:= $(host)
+HOLESSTAMP	:= $(holesys)-stamp-holes
+HOLESDIR 	:= $(holesys)-holes
+
+SET_NATIVE_HOLES := SHELL=sh ; PATH=`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_CYGNUS_PATH  := SHELL=sh ; PATH=$(relbindir):`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+SET_LATEST_PATH  := SHELL=sh ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+
+endif
 
 .PHONY: all
-all:	$(TREE) do1 do2 do3 comparison
+ifneq ($(target),$(host))
+##
+## This is a cross compilation
+##
+arch 		= $(host)-x-$(target)
+config  	= -host=$(host) -target=$(target)
+FLAGS_TO_PASS	:= $(FLAGS_TO_PASS) "target=$(target)"
+
+ifneq ($(build),$(host))
+all:	do-cygnus do-latest
+build-all: build-cygnus build-latest
+else
+all:	do-native do-latest
+build-all: build-native build-latest
+endif
+
+ifeq ($(target),mips-idt-ecoff)
+configargs	:= $(configargs) -with-gnu-as -with-stabs
+endif
+
+ifeq ($(host),i386-go32)
+ifeq ($(subst mips-idt-ecoff,sparclite-aout,$(target)),sparclite-aout)
+configargs	:= $(configargs) -with-gnu-ld
+endif
+endif
+
+else
+##
+## This is a native compilation
+##
+arch		= $(host)
+config  	= -host=$(host)
+ifneq ($(build),$(host))
+all:	do-cygnus do-latest
+else
+all:	$(host)-stamp-3stage-done
+endif
+#all:	in-place do1 do2 do3 comparison
+
+ifeq ($(subst mips-sgi-irix4,mips-dec-ultrix,$(host)),mips-dec-ultrix)
+configargs	:= $(configargs) -with-gnu-as -with-stabs
+endif
+
+endif
+
+ifeq ($(target),m68k-hp-hpux)
+configargs	:= $(configargs) -with-gnu-as
+endif
+
+
+NATIVEDIR	:= $(arch)-native-objdir
+CYGNUSDIR	:= $(arch)-cygnus-objdir
+LATESTDIR	:= $(arch)-latest-objdir
+
+
+everything: 	 do-cross 
+#everything: 	in-place do1 do2 do3 comparison do-cygnus 
+
+.PHONY: do-native
+do-native: $(HOLESSTAMP) $(arch)-stamp-native
+do-native-config: $(arch)-stamp-native-configured
+build-native: $(HOLESSTAMP) $(arch)-stamp-native-checked
+config-native: $(HOLESSTAMP) $(arch)-stamp-native-configured
+
+$(arch)-stamp-native: $(HOLESSTAMP)
+	$(SET_NATIVE_HOLES) $(TIME) $(GNU_MAKE) -f test-build.mk  $(arch)-stamp-native-installed $(FLAGS_TO_PASS) 
+	if [ -f CLEAN_ALL ] ; then rm -rf $(NATIVEDIR) ; else true ; fi
+	touch $(arch)-stamp-native
+
+$(arch)-stamp-native-installed: $(HOLESSTAMP) $(arch)-stamp-native-checked
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) install 
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) install-info 
+	touch $@
+
+$(arch)-stamp-native-checked: $(arch)-stamp-native-built
+#	cd $(NATIVEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) check 
+	touch $@
+
+$(arch)-stamp-native-built: $(HOLESSTAMP) $(arch)-stamp-native-configured
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) all 
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) info 
+	touch $@
+
+$(arch)-stamp-native-configured: $(HOLESSTAMP)
+	[ -d $(NATIVEDIR) ] || mkdir $(NATIVEDIR)
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	touch $@
+
+
+.PHONY: do-cygnus
+do-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus
+build-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-checked
+config-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-configured
+
+vault-cygnus: $(HOLESSTAMP) $(arch)-stamp-cygnus-built
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) vault-install 
+	
+
+$(arch)-stamp-cygnus: 
+	[ -f $(relbindir)/$(host)-gcc ] || (echo "must have gcc available"; exit 1)
+	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) -f test-build.mk $(arch)-stamp-cygnus-installed  $(FLAGS_TO_PASS)
+	if [ -f CLEAN_ALL ] ; then rm -rf $(CYGNUSDIR) ; else true ; fi
+	touch $(arch)-stamp-cygnus
+
+$(arch)-stamp-cygnus-installed:  $(HOLESSTAMP) $(arch)-stamp-cygnus-checked
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install 
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install-info
+	touch $@
+
+$(arch)-stamp-cygnus-checked: $(HOLESSTAMP) $(arch)-stamp-cygnus-built
+#	cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) check 
+	touch $@
+
+$(arch)-stamp-cygnus-built:  $(HOLESSTAMP) $(arch)-stamp-cygnus-configured
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) all 
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) info 
+	touch $@
+
+$(arch)-stamp-cygnus-configured:  $(HOLESSTAMP)
+	[ -d $(CYGNUSDIR) ] || mkdir $(CYGNUSDIR)
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(GNUC) $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	touch $@
+
+.PHONY: do-latest
+do-latest: $(HOLESSTAMP) $(arch)-stamp-latest
+build-latest: $(HOLESSTAMP) $(arch)-stamp-latest-checked
+
+$(arch)-stamp-latest:
+	$(SET_LATEST_PATH) $(TIME) $(GNU_MAKE) -f test-build.mk $(arch)-stamp-latest-installed  $(FLAGS_TO_PASS)
+	touch $(arch)-stamp-latest
+
+$(arch)-stamp-latest-installed:  $(HOLESSTAMP) $(arch)-stamp-latest-checked
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install 
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install-info 
+	touch $@
+
+$(arch)-stamp-latest-checked: $(arch)-stamp-latest-built
+#	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) check 
+	touch $@
+
+$(arch)-stamp-latest-built: $(arch)-stamp-latest-configured
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) all 
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) info 
+	touch $@
+
+$(arch)-stamp-latest-configured:
+	[ -d $(LATESTDIR) ] || mkdir $(LATESTDIR)
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(GNUC) $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
+	touch $@
+
+
+.PHONY: in-place
+in-place:	$(host)-stamp-in-place
+
+$(host)-stamp-in-place: 
+	PATH=/bin:/usr/bin:/usr/ucb ; \
+	  export PATH ; \
+	  SHELL=/bin/sh ; export SHELL ; \
+	  $(TIME) $(GNU_MAKE) -f test-build.mk $(host)-stamp-in-place-installed host=$(host) $(FLAGS_TO_PASS)
+	touch $@
+	if [ -f CLEAN_ALL ] ; then \
+	  rm -rf $(INPLACEDIR) ; \
+ 	else \
+	  mv $(INPLACEDIR) $(STAGE1DIR) ; \
+	fi
+
+$(host)-stamp-in-place-installed: $(host)-stamp-in-place-checked
+	cd $(INPLACEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" install host=$(host)
+	cd $(INPLACEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" install-info host=$(host)
+	touch $@
+
+$(host)-stamp-in-place-checked: $(host)-stamp-in-place-built
+#	cd $(INPLACEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" check host=$(host)
+	touch $@
+
+$(host)-stamp-in-place-built: $(host)-stamp-in-place-configured
+	cd $(INPLACEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" all host=$(host)
+	cd $(INPLACEDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" info host=$(host)
+	touch $@
+
+$(host)-stamp-in-place-configured: $(host)-stamp-in-place-cp
+	cd $(INPLACEDIR) ; $(configenv) $(TIME) ./configure $(config) -v $(prefixes) $(configargs)
+	touch $@
+
+$(host)-stamp-in-place-cp:
+	rm -rf $(INPLACEDIR)
+	mkdir $(INPLACEDIR)
+	(cd $(TREE) ; tar cf - .) | (cd $(INPLACEDIR) ; tar xf -)
+	touch $@
+
+$(host)-stamp-3stage-done: do1 do2 do3 comparison
+	touch $@
+
 
 .PHONY: do1
-do1:	$(host)-stamp-holes $(host)-stamp-stage1
+do1:	    $(HOLESSTAMP) $(host)-stamp-stage1
+do1-config: $(HOLESSTAMP) $(host)-stamp-stage1-configured
+do1-build:  $(HOLESSTAMP) $(host)-stamp-stage1-checked
+
+do1-vault: $(HOLESSTAMP) $(host)-stamp-stage1-built
+	if [ -d $(WORKING_DIR).1 ] ; then \
+	  $(SET_NATIVE_HOLES) cd $(WORKING_DIR).1 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	else \
+	  $(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	fi
 
 $(host)-stamp-stage1:
 	if [ -d $(STAGE1DIR) ] ; then \
@@ -80,113 +390,119 @@ $(host)-stamp-stage1:
 	else \
 		true ; \
 	fi
-	PATH=`pwd`/$(HOLESDIR) ; \
-		export PATH ; \
-		SHELL=sh ; export SHELL ; \
-		$(TIME) $(GNU_MAKE) $(host)-stamp-stage1-installed host=$(host) $(FLAGS_TO_PASS)
-	touch $(host)-stamp-stage1
-	mv $(WORKING_DIR) $(STAGE1DIR)
+	$(SET_NATIVE_HOLES) $(TIME) $(GNU_MAKE) -f test-build.mk $(FLAGS_TO_PASS) host=$(host) $(host)-stamp-stage1-installed
+	touch $@
+	if [ -f CLEAN_ALL ] ; then \
+	  rm -rf $(WORKING_DIR) ; \
+	else \
+	  mv $(WORKING_DIR) $(STAGE1DIR) ; \
+	fi
 
 $(host)-stamp-stage1-installed: $(host)-stamp-stage1-checked
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) install host=$(host))
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) install-info host=$(host))
+	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" install host=$(host)
+	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" install-info host=$(host)
+ifeq ($(host),rs6000-ibm-aix)
+	-rm $(relbindir)/make
+endif
 	touch $@
 
 $(host)-stamp-stage1-checked: $(host)-stamp-stage1-built
-#	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) check host=$(host))
+#	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" check host=$(host)
 	touch $@
 
 $(host)-stamp-stage1-built: $(host)-stamp-stage1-configured
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) all host=$(host))
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(MF) info host=$(host))
+	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" all host=$(host)
+	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) "CFLAGS=$(CFLAGS)" info host=$(host)
 	touch $@
 
 $(host)-stamp-stage1-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
-	(cd $(WORKING_DIR) ; \
-		$(TIME) ../$(TREE)/configure $(host) -v -srcdir=../$(TREE) \
-			-prefix=$(release_root) \
-			-exec_prefix=$(release_root)/H-$(host))
+	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; \
+	  $(configenv) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do2
 do2:	$(HOLESDIR) $(host)-stamp-stage2
 
+do2-vault: $(HOLESSTAMP) $(host)-stamp-stage2-built
+	if [ -d $(WORKING_DIR).2 ] ; then \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR).2 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	else \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	fi
+
+
+
 $(host)-stamp-stage2:
 	if [ -d $(STAGE2DIR) ] ; then \
 		mv $(STAGE2DIR) $(WORKING_DIR) ; \
 	else \
 		true ; \
 	fi
-	PATH=$(release_root)/H-$(host)/bin:`pwd`/$(HOLESDIR) ; \
-		export PATH ; \
-		SHELL=sh ; export SHELL ; \
-		$(TIME) $(MAKE) -w $(STAGE2DIR) host=$(host) $(FLAGS_TO_PASS)
-	touch $(host)-stamp-stage2
-
-$(STAGE2DIR): $(host)-stamp-stage2-installed
+	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) $(FLAGS_TO_PASS) -f test-build.mk -w $(host)-stamp-stage2-installed
 	mv $(WORKING_DIR) $(STAGE2DIR)
+	touch $@
+
 
 $(host)-stamp-stage2-installed: $(host)-stamp-stage2-checked
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" install host=$(host))
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" install-info host=$(host))
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install-info host=$(host)
 	touch $@
 
 $(host)-stamp-stage2-checked: $(host)-stamp-stage2-built
-#	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" check host=$(host))
+#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host)
 	touch $@
 
 $(host)-stamp-stage2-built: $(host)-stamp-stage2-configured
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" all host=$(host))
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" info host=$(host))
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" all host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" info host=$(host)
 	touch $@
 
 $(host)-stamp-stage2-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
-	(cd $(WORKING_DIR) ; \
-		$(TIME) ../$(TREE)/configure $(host) -v -srcdir=../$(TREE) \
-			-prefix=$(release_root) \
-			-exec_prefix=$(release_root)/H-$(host))
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
+	  $(configenv) $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do3
 do3:	$(HOLESDIR) $(host)-stamp-stage3
 
+do3-vault: $(HOLESSTAMP) $(host)-stamp-stage3-built
+	if [ -d $(WORKING_DIR).3 ] ; then \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR).3 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	else \
+	  $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \
+	fi
+
 $(host)-stamp-stage3:
 	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) -w $(STAGE3DIR) host=$(host) $(FLAGS_TO_PASS)
-	touch $(host)-stamp-stage3
+	$(SET_CYGNUS_PATH) $(TIME) $(GNU_MAKE) $(FLAGS_TO_PASS) -f test-build.mk -w $(host)-stamp-stage3-checked 
+	mv $(WORKING_DIR) $(STAGE3DIR) 
+	touch $@
 
-$(STAGE3DIR): $(host)-stamp-stage3-checked
-	mv $(WORKING_DIR) $(STAGE3DIR)
 
 $(host)-stamp-stage3-installed: $(host)-stamp-stage3-checked
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" install host=$(host))
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" install-info host=$(host))
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" install-info host=$(host)
 	touch $@
 
 $(host)-stamp-stage3-checked: $(host)-stamp-stage3-built
-#	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" check host=$(host))
+#	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host)
 	touch $@
 
 $(host)-stamp-stage3-built: $(host)-stamp-stage3-configured
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" all host=$(host))
-	(cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(MF) "CC=$(GCC)" info host=$(host))
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" all host=$(host)
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" info host=$(host)
 	touch $@
 
 $(host)-stamp-stage3-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
-	(cd $(WORKING_DIR) ; \
-		$(TIME) ../$(TREE)/configure $(host) -v -srcdir=../$(TREE) \
-			-prefix=$(release_root) \
-			-exec_prefix=$(release_root)/H-$(host))
+	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
+	  $(configenv) $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 # These things are needed by a three-stage, but are not included locally.
@@ -200,16 +516,22 @@ HOLES := \
 	cat \
 	cc \
 	chmod \
+	chgrp \
+	chown \
 	cmp \
 	cp \
+	cpio \
 	date \
 	diff \
+	dirname \
 	echo \
 	egrep \
 	ex \
 	expr \
+	false \
 	find \
 	grep \
+	head \
 	hostname \
 	install \
 	ld \
@@ -227,36 +549,43 @@ HOLES := \
 	sed \
 	sh \
 	sort \
+	tar \
 	test \
 	time \
 	touch \
 	tr \
 	true \
+	uname \
+	uniq \
+	uudecode \
+	wc \
 	whoami
 
 ### so far only sun make supports VPATH
-ifeq ($(subst sun3,sun4,$(host)),sun4)
+ifeq ($(subst sun3,sun4,$(holesys)),sun4)
 MAKE_HOLE :=
 else
 MAKE_HOLE := make
 endif
 
-### rs6000 as is busted.  We cache a patched version in unsupported.
-ifeq ($(subst sun3,rs6000,$(host)),rs6000)
-AS_HOLE := as
-else
-AS_HOLE :=
+### solaris 2 -- don't use /usr/ucb/cc
+ifeq (sparc-sun-solaris2,$(holesys))
+SET_NATIVE_HOLES := SHELL=sh ; PATH=/opt/SUNWspro/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ;
+HOLE_DIRS := /usr/ccs/bin
+CC_HOLE :=
+NUKEM := cc 
 endif
 
 ### These things are also needed by a three-stage, but in this case, the GNU version of the tool is required.
 PARTIAL_HOLES := \
-	$(AS_HOLE) \
 	$(MAKE_HOLE) \
+	$(CC_HOLE) \
 	flex \
 	m4
 
 ### look in these directories for things missing from a three-stage
 HOLE_DIRS := \
+	$(HOLE_DIRS) \
 	/bin \
 	/usr/bin \
 	/usr/ucb \
@@ -266,19 +595,20 @@ HOLE_DIRS := \
 PARTIAL_HOLE_DIRS := \
 	/usr/latest/bin \
 	/usr/progressive/bin \
+	$(PARTIAL_HOLE_DIRS) \
 	/usr/vintage/bin \
 	/usr/unsupported/bin
 
-$(HOLESDIR): $(host)-stamp-holes
+$(HOLESDIR): $(holesys)-stamp-holes
 
-$(host)-stamp-holes:
+$(holesys)-stamp-holes:
 	-rm -rf $(HOLESDIR)
 	-mkdir $(HOLESDIR)
-	for i in $(HOLES) ; do \
+	@for i in $(HOLES) ; do \
 		found= ; \
 		for j in $(HOLE_DIRS) ; do \
 			if [ -x $$j/$$i ] ; then \
-				cp $$j/$$i $(HOLESDIR) ; \
+				ln -s $$j/$$i $(HOLESDIR) || cp $$j/$$i $(HOLESDIR) ; \
 				echo $$i from $$j ; \
 				found=t ; \
 				break ; \
@@ -289,7 +619,7 @@ $(host)-stamp-holes:
 		*) echo $$i is NOT found ;; \
 		esac ; \
 	done
-	for i in $(PARTIAL_HOLES) ; do \
+	@for i in $(PARTIAL_HOLES) ; do \
 		found= ; \
 		for j in $(PARTIAL_HOLE_DIRS) ; do \
 			if [ -x $$j/$$i ] ; then \
@@ -305,33 +635,137 @@ $(host)-stamp-holes:
 		*) echo $$i is NOT found ;; \
 		esac ; \
 	done
-	touch $(host)-stamp-holes
+ifdef NUKEM
+	cd $(HOLESDIR); rm -f $(NUKEM)
+endif
+	touch $@
+
+# Get the cross-tools for build cross host when not building on the host.
+
+BUILD_HOST_HOLES := \
+	byacc \
+	gcc \
+	makeinfo \
+	$(AR) \
+	$(AS) \
+	$(CC) \
+	$(CXX) \
+	$(GXX) \
+	$(NM) \
+	$(RANLIB)
+
+BUILD_HOLES_DIRS := $(release_root)/H-$(build)/bin $(PARTIAL_HOLE_DIRS)
+
+ifdef BUILD_HOST_HOLES_DIR
+$(BUILD_HOST_HOLES_DIR): $(build)-x-$(host)-stamp-holes
+endif
+
+ifneq ($(build),$(host))
+$(build)-x-$(host)-stamp-holes:
+	-rm -rf $(BUILD_HOST_HOLES_DIR)
+	-mkdir $(BUILD_HOST_HOLES_DIR)
+	@for i in $(BUILD_HOST_HOLES) ; do \
+		found= ; \
+		for j in $(BUILD_HOLES_DIRS) ; do \
+			if [ -x $$j/$$i ] ; then \
+				ln -s $$j/$$i $(BUILD_HOST_HOLES_DIR) || cp $$j/$$i $(BUILD_HOST_HOLES_DIR) ; \
+				echo $$i from $$j ; \
+				found=t ; \
+				break ; \
+			fi ; \
+		done ; \
+		case "$$found" in \
+		t) ;; \
+		*) echo $$i is NOT found ;; \
+		esac ; \
+	done
+	touch $@
+endif
+
+# Get the cross tools for build cross target when not building on the host.
+
+BUILD_TARGET_HOLES := \
+	byacc \
+	gcc \
+	makeinfo \
+	$(AR_FOR_TARGET) \
+	$(AS_FOR_TARGET) \
+	$(CC_FOR_TARGET) \
+	$(CXX_FOR_TARGET) \
+	$(GXX_FOR_TARGET) \
+	$(NM_FOR_TARGET) \
+	$(RANLIB_FOR_TARGET)
+
+ifdef BUILD_TARGET_HOLES_DIR
+$(BUILD_TARGET_HOLES_DIR): $(build)-x-$(target)-stamp-holes
+endif
+
+ifneq ($(build),$(target))
+$(build)-x-$(target)-stamp-holes:
+	-rm -rf $(BUILD_TARGET_HOLES_DIR)
+	-mkdir $(BUILD_TARGET_HOLES_DIR)
+	@for i in $(BUILD_TARGET_HOLES) ; do \
+		found= ; \
+		for j in $(BUILD_HOLES_DIRS) ; do \
+			if [ -x $$j/$$i ] ; then \
+				ln -s $$j/$$i $(BUILD_TARGET_HOLES_DIR) || cp $$j/$$i $(BUILD_TARGET_HOLES_DIR) ; \
+				echo $$i from $$j ; \
+				found=t ; \
+				break ; \
+			fi ; \
+		done ; \
+		case "$$found" in \
+		t) ;; \
+		*) echo $$i is NOT found ;; \
+		esac ; \
+	done
+	touch $@
+endif
 
 .PHONY: comparison
-comparison:
-ifeq ($(subst rs6000,iris4,$(subst decstation,iris4,$(host))),iris4)
+comparison: $(host)-stamp-3stage-compared
+
+$(host)-stamp-3stage-compared:
+	rm -f .bad-compare
+ifeq ($(subst i386-sco3.2v4,mips-sgi-irix4,$(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host)))),mips-sgi-irix4)
 	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 ; \
+		if cmp foo1 foo2 ; then \
+			true ; \
+		else \
+			echo $$i ; \
+			touch .bad-compare ; \
+		fi ; \
 	done
+	rm -f foo1 foo2
 else
 	for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
-		cmp $(STAGE2DIR)/$$i $(STAGE3DIR)/$$i ; \
+		cmp $(STAGE2DIR)/$$i $(STAGE3DIR)/$$i || touch .bad-compare ; \
 	done
 endif
+	if [ -f CLEAN_ALL ] ; then \
+	  rm -rf $(STAGE2DIR) $(STAGE3DIR) ; \
+	else \
+	  if [ -f CLEAN_STAGES ] ; then \
+	    if [ -f .bad-compare ] ; then \
+	      true ; \
+	    else \
+	      rm -rf $(STAGE1DIR) $(STAGE2DIR) ; \
+	    fi ; \
+	  else true ; \
+	  fi ; \
+	fi
+	touch $@	
 
 .PHONY: clean
 clean:
-	rm -rf $(HOLESDIR) $(WORKING_DIR)* $(host)-stamp-* *~
+	rm -rf $(HOLESDIR) $(INPLACEDIR) $(WORKING_DIR)* $(host)-stamp-* *~
 
 .PHONY: very
 very:
 	rm -rf $(TREE)
 
-$(TREE):
-	$(TIME) cvs co $(CVS_TAG) $(CVS_MODULE)
-
 force:
 
 endif # host