X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=test-build.mk;h=939852bd0a96f9e9a399bf051d35018bb2b891d7;hb=4f235110292d822a18dfaecbfebe002dce5e2e88;hp=d7aaf49bdeea16af86d3245dc82d6a8b3c6ce494;hpb=c8f1aa31aa6a27bf30ddbc2b197108e755ccef8e;p=deliverable%2Fbinutils-gdb.git diff --git a/test-build.mk b/test-build.mk index d7aaf49bde..939852bd0a 100644 --- a/test-build.mk +++ b/test-build.mk @@ -32,13 +32,16 @@ TREE := devo include $(TREE)/release-info +# Set TIME to time to get timings. Not done by default because time +# ignores the exit status. +TIME := -TIME := time CONFIG_SHELL := -GCC := $(host)-gcc -O -GNUC := CC="$(GCC)" +GCC := $(host)-gcc +GNUCFLAGS := -g -O2 +GNUC := CC="$(GCC)" CFLAGS="$(GNUCFLAGS)" CFLAGS := -g -CXXFLAGS := -g -O +CXXFLAGS := -g -O2 GNU_MAKE := /usr/latest/bin/make -w MAKEINFOFLAGS := @@ -56,6 +59,18 @@ ifndef target target := $(host) endif +ifeq ($(patsubst %-lynx,lynx,$(host)),lynx) +SHELL := /bin/bash +GNU_MAKE := $(MAKE) +CONFIG_SHELL := /bin/bash +endif + +ifeq ($(patsubst %-m68k-hp-hpux,m68k-hp-hpux,$(host)),m68k-hp-hpux) +SHELL := /usr/unsupported/bin/bash +GNU_MAKE := $(MAKE) +CONFIG_SHELL := /usr/unsupported/bin/bash +endif + ifneq ($(build),$(host)) # We are building on a machine other than the host. We rely upon @@ -71,9 +86,10 @@ BISON := byacc CC := $(host)-gcc CC_FOR_BUILD := gcc CC_FOR_TARGET := $(target)-gcc -CXX := $(host)-c++ -CXX_FOR_TARGET := $(target)-c++ -GCC := $(host)-gcc -O +CFLAGS := $(GNUCFLAGS) +CXX := $(host)-gcc +CXX_FOR_TARGET := $(target)-gcc +GCC := $(host)-gcc GXX := $(host)-g++ GXX_FOR_TARGET := $(target)-g++ HOST_PREFIX := $(build)- @@ -87,8 +103,8 @@ RANLIB := $(host)-ranlib RANLIB_FOR_TARGET := $(target)-ranlib YACC := $(BISON) -ifeq ($(build),hppa1.1-hp-hpux) -CC_FOR_BUILD := cc +ifeq ($(host),i386-go32) +MAKEINFOFLAGS = --no-split endif FLAGS_TO_PASS := \ @@ -118,6 +134,7 @@ FLAGS_TO_PASS := \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ "RELEASE_TAG=$(RELEASE_TAG)" \ "RUNTEST=$(relbindir)/runtest" \ + "SHELL=$(SHELL)" \ "TIME=$(TIME)" \ "YACC=$(YACC)" \ "build=$(build)" \ @@ -139,7 +156,8 @@ FLAGS_TO_PASS := \ "MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \ "MF=$(MF)" \ "host=$(host)" \ - "RELEASE_TAG=$(RELEASE_TAG)" + "RELEASE_TAG=$(RELEASE_TAG)" \ + "SHELL=$(SHELL)" configenv := @@ -151,10 +169,18 @@ CC := cc -Xs endif ifeq ($(host),mips-sgi-irix4) -CC := cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh1500 +CC := cc -cckr -Wf,-XNg1500 -Wf,-XNk1000 -Wf,-XNh2000 +endif + +ifeq ($(host),hppa1.1-hp-hpux) +CC := cc -Wp,-H256000 endif -ifeq ($(host),mips-mips-riscos5) +ifeq ($(host),m68k-hp-hpux) +CC := cc -Wp,-P,-H256000 +endif + +ifeq ($(host),mips-mips-riscos5sysv) CC := cc -non_shared -systype sysv endif @@ -166,10 +192,43 @@ ifeq ($(host),m68k-sun-sunos4.1.1) CC := cc -J endif +# Support gdbtk everywhere +configargs = --enable-gdbtk + +# We want to use stabs for MIPS targets. +ifeq ($(target),mips-idt-ecoff) +configargs := $(configargs) --with-stabs +endif + +ifeq ($(target),mips-dec-ultrix) +configargs := $(configargs) --with-stabs +endif + +ifeq ($(target),mips-sgi-irix4) +configargs := $(configargs) --with-stabs +endif + +ifeq ($(target),mips-sgi-irix5) +configargs := $(configargs) --with-stabs +endif + +ifeq ($(patsubst alpha-dec-osf%,alpha,$(target)),alpha) +configargs := $(configargs) --with-stabs +endif + +# We must use stabs for SVR4 targets. +ifeq ($(target),i386-sysv4.2) +configargs := $(configargs) --with-stabs +endif + ifneq ($(CC), 'cc') FLAGS_TO_PASS := "CC=$(CC)" $(FLAGS_TO_PASS) endif +#### and on some, we need CONFIG_SHELL +ifeq ($(patsubst %-lynxos,lynxos,$(host)),lynxos) +FLAGS_TO_PASS := "CONFIG_SHELL=$(CONFIG_SHELL)" $(FLAGS_TO_PASS) +endif # These are the prefixes used for Cygnus builds. prefixes = --prefix=$(release_root) --exec-prefix=$(release_root)/H-$(host) @@ -195,9 +254,9 @@ 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 ; +SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ; +SET_CYGNUS_PATH := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ; +SET_LATEST_PATH := SHELL=$(SHELL) ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR):`pwd`/$(BUILD_HOST_HOLES_DIR):`pwd`/$(BUILD_TARGET_HOLES_DIR) ; export PATH ; export SHELL ; else @@ -205,9 +264,9 @@ 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 ; +SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ; +SET_CYGNUS_PATH := SHELL=$(SHELL) ; PATH=$(relbindir):`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ; +SET_LATEST_PATH := SHELL=$(SHELL) ; PATH=/usr/latest/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ; endif @@ -220,6 +279,50 @@ arch = $(host)-x-$(target) config = -host=$(host) -target=$(target) FLAGS_TO_PASS := $(FLAGS_TO_PASS) "target=$(target)" +ifeq ($(patsubst %-lynx,lynx,$(target)),lynx) +configargs := $(configargs) --with-headers=/s1/cygnus/dejagnu/$(target)/include \ + --with-libs=/s1/cygnus/dejagnu/$(target)/lib +endif + +ifeq ($(patsubst %-i386-sysv4.2,i386-sysv4.2,$(target)),i386-sysv4.2) +configargs := $(configargs) --with-headers=/s1/cygnus/dejagnu/$(target)/include \ + --with-libs=/s1/cygnus/dejagnu/$(target)/lib +endif + +ifeq ($(patsubst %-i386-netware,i386-netware,$(target)),i386-netware) +configargs := $(configargs) \ + --with-headers=/s1/cygnus/dejagnu/$(target)/include \ + --with-libs=/s1/cygnus/dejagnu/$(target)/lib +endif + +ifeq ($(patsubst %-sparc-sun-sunos4.1.3,sparc-sun-sunos4.1.3,$(target)),sparc-sun-sunos4.1.3) +configargs := $(configargs) \ + --with-headers=/s1/cygnus/dejagnu/$(target)/include \ + --with-libs=/s1/cygnus/dejagnu/$(target)/lib +endif + +ifeq ($(patsubst %-sparc-sun-solaris2,sparc-sun-solaris2,$(target)),sparc-sun-solaris2) +configargs := $(configargs) \ + --with-headers=/s1/cygnus/dejagnu/$(target)/include \ + --with-libs=/s1/cygnus/dejagnu/$(target)/lib +endif + +ifeq ($(patsubst %-i960-vxworks5.1,i960-vxworks5.1,$(target)),i960-vxworks5.1) +configargs := $(configargs) \ + --with-headers=/s1/cygnus/dejagnu/$(target)/include +endif + +ifeq ($(patsubst %-m68k-vxworks5.1,m68k-vxworks5.1,$(target)),m68k-vxworks5.1) +configargs := $(configargs) \ + --with-headers=/s1/cygnus/dejagnu/$(target)/include +endif + +ifeq ($(patsubst %-i386-unixware,i386-unixware,$(target)),i386-unixware) +configargs := $(configargs) \ + --with-headers=/s1/cygnus/dejagnu/$(target)/include \ + --with-libs=/s1/cygnus/dejagnu/$(target)/lib +endif + ifneq ($(build),$(host)) all: do-cygnus do-latest build-all: build-cygnus build-latest @@ -356,7 +459,7 @@ $(arch)-stamp-cygnus-installed: $(HOLESSTAMP) $(arch)-stamp-cygnus-checked $(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(TIME) $(MAKE) $(FLAGS_TO_PASS) $(GNUC) install-info if [ -f VAULT-INSTALL ] ; then \ $(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(MAKE) $(FLAGS_TO_PASS) $(GNUC) vault-install ; \ - fi + else true ; fi touch $@ $(arch)-stamp-cygnus-checked: $(HOLESSTAMP) $(arch)-stamp-cygnus-built @@ -475,6 +578,9 @@ $(host)-stamp-stage1-installed: $(host)-stamp-stage1-checked $(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 +ifeq ($(host),rs6000-ibm-aix3.2.5) + -rm $(relbindir)/make endif touch $@ @@ -498,9 +604,9 @@ 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 ; \ + $(SET_CYGNUS_PATH) cd $(WORKING_DIR).2 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \ else \ - $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \ + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \ fi @@ -516,18 +622,23 @@ $(host)-stamp-stage2: touch $@ +# The SunOS make program gets confused when it is deleted while running. +# The signal handlers return to the wrong place, or something, and the +# program dumps core. To avoid trouble with installing make over itself, +# we delete the installed make program. $(host)-stamp-stage2-installed: $(host)-stamp-stage2-checked - $(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) + -rm -f $(relbindir)/make + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(GNU_MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install host=$(host) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install-info host=$(host) touch $@ $(host)-stamp-stage2-checked: $(host)-stamp-stage2-built -# $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host) +# $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host) touch $@ $(host)-stamp-stage2-built: $(host)-stamp-stage2-configured - $(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) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) all host=$(host) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) info host=$(host) touch $@ $(host)-stamp-stage2-configured: @@ -541,9 +652,9 @@ 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 ; \ + $(SET_CYGNUS_PATH) cd $(WORKING_DIR).3 ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \ else \ - $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(CFLAGS)" vault-install ; \ + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(MAKE) $(FLAGS_TO_PASS) host=$(host) "CFLAGS=$(GNUCFLAGS)" vault-install ; \ fi $(host)-stamp-stage3: @@ -557,21 +668,30 @@ $(host)-stamp-stage3: touch $@ +# The SunOS make program gets confused when it is deleted while running. +# The signal handlers return to the wrong place, or something, and the +# program dumps core. To avoid trouble with installing make over itself, +# we delete the installed make program. $(host)-stamp-stage3-installed: $(host)-stamp-stage3-checked - $(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) + -rm -f $(relbindir)/make + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(GNU_MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install host=$(host) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install-info host=$(host) if [ -f VAULT-INSTALL ] ; then \ $(SET_CYGNUS_PATH) cd $(CYGNUSDIR) ; $(MAKE) $(FLAGS_TO_PASS) $(GNUC) vault-install ; \ - fi + else true ; fi touch $@ $(host)-stamp-stage3-checked: $(host)-stamp-stage3-built -# $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host) +# $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host) + touch $@ + +$(host)-check-3stage: $(host)-stamp-stage3 + $(SET_CYGNUS_PATH) cd $(STAGE3DIR) ; $(TIME) $(MAKE) -k -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host) touch $@ $(host)-stamp-stage3-built: $(host)-stamp-stage3-configured - $(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) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) all host=$(host) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) info host=$(host) touch $@ $(host)-stamp-stage3-configured: @@ -595,17 +715,17 @@ $(host)-stamp-stage4: $(host)-stamp-stage4-installed: $(host)-stamp-stage4-checked - $(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) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install host=$(host) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) install-info host=$(host) touch $@ $(host)-stamp-stage4-checked: $(host)-stamp-stage4-built -# $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) "CFLAGS=$(CFLAGS)" check host=$(host) +# $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) check host=$(host) touch $@ $(host)-stamp-stage4-built: $(host)-stamp-stage4-configured - $(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) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) all host=$(host) + $(SET_CYGNUS_PATH) cd $(WORKING_DIR) ; $(TIME) $(MAKE) -w $(FLAGS_TO_PASS) $(GNUC) info host=$(host) touch $@ $(host)-stamp-stage4-configured: @@ -657,7 +777,9 @@ HOLES := \ rmdir \ sed \ sh \ + sleep \ sort \ + tail \ tar \ test \ time \ @@ -666,6 +788,7 @@ HOLES := \ true \ uname \ uniq \ + uptime \ uudecode \ wc \ whoami @@ -679,7 +802,7 @@ endif ### 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 ; +SET_NATIVE_HOLES := SHELL=$(SHELL) ; PATH=/opt/SUNWspro/bin:`pwd`/$(HOLESDIR) ; export PATH ; export SHELL ; HOLE_DIRS := /usr/ccs/bin CC_HOLE := NUKEM := cc @@ -689,6 +812,22 @@ ifeq ($(host),i386-go32) DOS_HOLES := aout2exe doschk file endif +ifeq ($(host),i386-lynx) +MAKE_HOLE := make +endif + +ifeq ($(host),m68k-lynx) +MAKE_HOLE := make +endif + +ifeq ($(host),sparc-lynx) +MAKE_HOLE := make +endif + +ifeq ($(host),rs6000-lynx) +MAKE_HOLE := make +endif + ### These things are also needed by a three-stage, but in this case, the GNU version of the tool is required. PARTIAL_HOLES := \ $(MAKE_HOLE) \ @@ -703,6 +842,7 @@ HOLE_DIRS := \ /bin \ /usr/bin \ /usr/ucb \ + /etc /usr/etc \ /usr/unsupported/bin ### look in these directories for alternate versions of some tools. @@ -711,7 +851,8 @@ PARTIAL_HOLE_DIRS := \ /usr/progressive/bin \ $(PARTIAL_HOLE_DIRS) \ /usr/vintage/bin \ - /usr/unsupported/bin + /usr/unsupported/bin \ + $(HOLE_DIRS) $(HOLESDIR): $(holesys)-stamp-holes @@ -842,7 +983,7 @@ comparison-stage3to4: $(host)-stamp-4stage-compared $(host)-stamp-3stage-compared: rm -f .bad-compare -ifeq ($(patsubst %-lynxos,mips-sgi-irix4,$(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) +ifeq ($(patsubst %-lynx,mips-sgi-irix4,$(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 ; \ @@ -875,7 +1016,7 @@ endif $(host)-stamp-4stage-compared: rm -f .bad-compare -ifeq ($(patsubst %-lynxos,mips-sgi-irix4,$(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) +ifeq ($(patsubst %-lynx,mips-sgi-irix4,$(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 $(STAGE4DIR) ; find . -name \*.o -print` ; do \ tail +10c $(STAGE3DIR)/$$i > foo1 ; \ tail +10c $(STAGE4DIR)/$$i > foo2 ; \