* build-all.mk: If host not specified, use config.guess. Pass TAG

	to test-build.mk as RELEASE_TAG.
	* test-build.mk (configargs): New variable containing arguments to
	pass to configure.  Set to -with-gnu-as on mips-dec-ultrix.
	(FLAGS_TO_PASS): Pass down RELEASE_TAG.

	* config.guess: Use /bin/uname when checking -X argument on SCO,
	to avoid invoking GNU uname which doesn't understand -X.

3 files changed, 39 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 204d043..7fb99be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 Thu Apr  1 08:25:42 1993  Ian Lance Taylor  (ian@cygnus.com)
 
+	* build-all.mk: If host not specified, use config.guess.  Pass TAG
+	to test-build.mk as RELEASE_TAG.
+	* test-build.mk (configargs): New variable containing arguments to
+	pass to configure.  Set to -with-gnu-as on mips-dec-ultrix.
+	(FLAGS_TO_PASS): Pass down RELEASE_TAG.
+
+	* config.guess: Use /bin/uname when checking -X argument on SCO,
+	to avoid invoking GNU uname which doesn't understand -X.
+
 	* test-build.mk: Don't use /usr/unsupported/bin/as on AIX.
 
 	* configure.in: Build gas for mips-*-*.
diff --git a/build-all.mk b/build-all.mk
index 0919e04..6eea5e0 100644
--- a/build-all.mk
+++ b/build-all.mk
@@ -5,22 +5,20 @@
 #
 #
 
-ifndef host
-error:; @echo You must set the variable \"host\" to use this Makefile ; exit 1
-else
-
-# the rest of the makefile
-
 TREE	= devo
 
 NATIVE  = native
 
-DATE	= 930309
+DATE	= 930401
 
 TAG	= latest-$(DATE)
 
 INSTALLDIR = /build/ian/devo-test/$(TAG)
 
+ifndef host
+host := $(shell $(TREE)/config.guess)
+endif
+
 GCC = gcc -O 
 CFLAGS = -g
 
@@ -28,7 +26,15 @@ log	= 1>$(canonhost)-build-log 2>&1
 tlog    = 1> $(canonhost)-x-$$i-build-log 2>&1
 
 canonhost := $(shell $(TREE)/config.sub $(host))
-ifeq ($(canonhost),i386-unknown-sco3.2v4)
+
+# Convert config.guess results to a simpler form.
+ifeq ($(canonhost),mips-dec-ultrix4.2)
+canonhost := mips-dec-ultrix
+endif
+ifeq ($(canonhost),mips-sgi-irix4.0.1)
+canonhost := mips-sgi-irix4
+endif
+ifeq ($(canonhost),i486-unknown-sco3.2v4.0)
 canonhost := i386-sco3.2v4
 endif
 
@@ -98,7 +104,8 @@ FLAGS_TO_PASS := \
 	"GCC=$(GCC)" \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
-	"host=$(canonhost)"
+	"host=$(canonhost)" \
+	"RELEASE_TAG=$(TAG)"
 
 all-cygnus:
 	@echo build started at `date`
@@ -195,8 +202,6 @@ build:
 	  fi ; \
 	done
 
-endif  # host
-
 ### Local Variables:
 ### fill-column: 131
 ### End:
diff --git a/test-build.mk b/test-build.mk
index a1111d7..54c5ae3 100644
--- a/test-build.mk
+++ b/test-build.mk
@@ -68,7 +68,8 @@ FLAGS_TO_PASS := \
 	"CFLAGS=$(CFLAGS)" \
 	"TIME=$(TIME)" \
 	"MF=$(MF)" \
-	"host=$(host)"
+	"host=$(host)" \
+	"RELEASE_TAG=$(RELEASE_TAG)"
 
 ifneq  '$(CC)' 'cc'
 FLAGS_TO_PASS := "CC=$(CC)" $(FLAGS_TO_PASS)
@@ -78,6 +79,11 @@ endif
 prefixes	= --prefix=$(release_root) --exec-prefix=$(release_root)/H-$(host)
 relbindir	= $(release_root)/H-$(host)/bin
 
+ifeq ($(host),mips-dec-ultrix)
+configargs	= -with-gnu-as
+else
+configargs	=
+endif
 
 ### general config stuff
 WORKING_DIR 	:= $(host)-objdir
@@ -150,7 +156,7 @@ $(arch)-stamp-native-built: $(host)-stamp-holes $(arch)-stamp-native-configured
 
 $(arch)-stamp-native-configured: $(host)-stamp-holes
 	[ -d $(NATIVEDIR) ] || mkdir $(NATIVEDIR)
-	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes)
+	$(SET_NATIVE_HOLES) cd $(NATIVEDIR) ; $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 
@@ -181,7 +187,7 @@ $(arch)-stamp-cygnus-built:  $(host)-stamp-holes $(arch)-stamp-cygnus-configured
 
 $(arch)-stamp-cygnus-configured:  $(host)-stamp-holes
 	[ -d $(CYGNUSDIR) ] || mkdir $(CYGNUSDIR)
-	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes)
+	$(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do-latest
@@ -208,7 +214,7 @@ $(arch)-stamp-latest-built: $(arch)-stamp-latest-configured
 
 $(arch)-stamp-latest-configured:
 	[ -d $(LATESTDIR) ] || mkdir $(LATESTDIR)
-	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes)
+	$(SET_LATEST_PATH) cd $(LATESTDIR) ; $(GNUC) $(TIME) ../$(TREE)/configure $(config) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 
@@ -242,7 +248,7 @@ $(host)-stamp-in-place-built: $(host)-stamp-in-place-configured
 	touch $@
 
 $(host)-stamp-in-place-configured: $(host)-stamp-in-place-cp
-	cd $(INPLACEDIR) ; $(TIME) ./configure $(host) -v $(prefixes)
+	cd $(INPLACEDIR) ; $(TIME) ./configure $(host) -v $(prefixes) $(configargs)
 	touch $@
 
 $(host)-stamp-in-place-cp:
@@ -294,7 +300,7 @@ $(host)-stamp-stage1-built: $(host)-stamp-stage1-configured
 $(host)-stamp-stage1-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
 	$(SET_NATIVE_HOLES) cd $(WORKING_DIR) ; \
-	  $(TIME) ../$(TREE)/configure $(host) -v --srcdir=../$(TREE) $(prefixes)
+	  $(TIME) ../$(TREE)/configure $(host) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do2
@@ -328,7 +334,7 @@ $(host)-stamp-stage2-built: $(host)-stamp-stage2-configured
 $(host)-stamp-stage2-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
 	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
-	  $(GNUC) $(TIME) ../$(TREE)/configure $(host) -v --srcdir=../$(TREE) $(prefixes)
+	  $(GNUC) $(TIME) ../$(TREE)/configure $(host) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 .PHONY: do3
@@ -362,7 +368,7 @@ $(host)-stamp-stage3-built: $(host)-stamp-stage3-configured
 $(host)-stamp-stage3-configured:
 	[ -d $(WORKING_DIR) ] || mkdir $(WORKING_DIR)
 	$(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; \
-	  $(GNUC) $(TIME) ../$(TREE)/configure $(host) -v --srcdir=../$(TREE) $(prefixes)
+	  $(GNUC) $(TIME) ../$(TREE)/configure $(host) -v --srcdir=../$(TREE) $(prefixes) $(configargs)
 	touch $@
 
 # These things are needed by a three-stage, but are not included locally.