Tue Dec 29 15:06:00 1992 Ian Lance Taylor (ian@cygnus.com)

	* build-all.mk: If canonhost is i386-unknown-sco3.2v4, change it
	to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
	(all-cygnus, native, build-cygnus): Make
	$(canonhost)-stamp-3stage-done, not $(host)....
	* test-build.mk (stamp-3stage-compared): Use tail +10c for
	i386-sco3.2v4.  Added else true to if command.

diff --git a/ChangeLog b/ChangeLog
index 046e5fdb0634dff646a22059fd4fde889bc562a3..01b4e2d2c627ed245efd1453a617b96f3b33c819 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Dec 29 15:06:00 1992  Ian Lance Taylor  (ian@cygnus.com)
+
+       * build-all.mk: If canonhost is i386-unknown-sco3.2v4, change it
+       to i386-sco3.2v4.  Set TARGETS and CFLAGS for i386-sco3.2v4.
+       (all-cygnus, native, build-cygnus): Make
+       $(canonhost)-stamp-3stage-done, not $(host)....
+       * test-build.mk (stamp-3stage-compared): Use tail +10c for
+       i386-sco3.2v4.  Added else true to if command.
+
 Mon Dec 28 12:08:56 1992  Ken Raeburn  (raeburn@cygnus.com)
 
        * config.sub: (from FSF) Sequent uses a BSD-like OS.

diff --git a/build-all.mk b/build-all.mk
index 5cd562382f758301e7af6cd8dce9470c4e7a33d1..75119369fb46bc117a7546082153b2c813f3a4ce 100644 (file)
--- a/build-all.mk
+++ b/build-all.mk
@@ -28,6 +28,9 @@ 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)
+canonhost := i386-sco3.2v4
+endif
 
 ifeq ($(canonhost),sparc-sun-sunos4.1.1)
 TARGETS        = $(NATIVE) m68k-aout   i386-aout       a29k-amd-udi \
@@ -79,6 +82,12 @@ CFLAGS = -g
 all: all-native
 endif
 
+ifeq ($(canonhost),i386-sco3.2v4)
+TARGETS = $(NATIVE) i386-aout
+CFLAGS =
+all: all-cygnus
+endif
+
 FLAGS_TO_PASS := \
        "GCC=$(GCC)" \
        "CFLAGS=$(CFLAGS)" \
@@ -93,7 +102,7 @@ all-cygnus:
          if [ "$$i" = "native" ] ; then \
             if [ ! -f $(canonhost)-3stage-done ] ; then \
              echo "3staging $(canonhost) native" ; \
-             $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) $(host)-stamp-3stage-done $(log) && \
+             $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) $(canonhost)-stamp-3stage-done $(log) && \
                 echo "     completed successfully" ; \
            fi \
          else \
@@ -109,7 +118,7 @@ native:
        [ -d $(INSTALLDIR) ] || mkdir $(INSTALLDIR)
        rm -f /usr/cygnus/$(TAG)
        ln -s $(INSTALLDIR) /usr/cygnus/$(TAG) 
-       $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) $(host)-stamp-3stage-done $(log)
+       $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) $(canonhost)-stamp-3stage-done $(log)
        @echo done at `date`
 
 build-cygnus:
@@ -118,7 +127,7 @@ build-cygnus:
          if [ "$$i" = "native" ] ; then \
             if [ ! -f $(canonhost)-3stage-done ] ; then \
              echo "3staging $(canonhost) native" ; \
-             $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) $(host)-stamp-3stage-done $(log) && \
+             $(MAKE) -f test-build.mk $(FLAGS_TO_PASS) $(canonhost)-stamp-3stage-done $(log) && \
                 echo "     completed successfully" ; \
            fi \
          else \

diff --git a/test-build.mk b/test-build.mk
index 035d17e699bb494e530d11d35fc8eb4bc3c541aa..55aa229cdfd163cf722b2eed5afe7fe726f74fa8 100644 (file)
--- a/test-build.mk
+++ b/test-build.mk
@@ -477,7 +477,7 @@ $(host)-stamp-holes:
                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 ; \
@@ -511,7 +511,7 @@ comparison: $(host)-stamp-3stage-compared
 
 $(host)-stamp-3stage-compared:
        rm -f .bad-compare
-ifeq ($(subst rs6000-ibm-aix,mips-sgi-irix4,$(subst mips-dec-ultrix,mips-sgi-irix4,$(host))),mips-sgi-irix4)
+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 ; \
@@ -537,6 +537,7 @@ endif
            else \
              rm -rf $(STAGE1DIR) $(STAGE2DIR) ; \
            fi ; \
+         else true ; \
          fi ; \
        fi
        touch $@