more cleanup
This commit is contained in:
parent
fea1500110
commit
8456a631c4
2 changed files with 44 additions and 18 deletions
30
build-all.mk
30
build-all.mk
|
@ -37,7 +37,7 @@
|
||||||
TREE = devo
|
TREE = devo
|
||||||
include $(TREE)/release-info
|
include $(TREE)/release-info
|
||||||
|
|
||||||
TEST_INSTALL_DISK = /galt
|
TEST_INSTALL_DISK = /tug
|
||||||
|
|
||||||
INSTALLDIR = $(TEST_INSTALL_DISK)/$(TREE)-test/$(RELEASE_TAG)
|
INSTALLDIR = $(TEST_INSTALL_DISK)/$(TREE)-test/$(RELEASE_TAG)
|
||||||
|
|
||||||
|
@ -95,10 +95,10 @@ ifeq ($(canonhost),i386-unknown-sysv4.2)
|
||||||
canonhost := i386-sysv4.2
|
canonhost := i386-sysv4.2
|
||||||
endif
|
endif
|
||||||
ifeq ($(canonhost),i386-lynx-lynxos)
|
ifeq ($(canonhost),i386-lynx-lynxos)
|
||||||
canonhost := i386-lynxos
|
canonhost := i386-lynx
|
||||||
endif
|
endif
|
||||||
ifeq ($(canonhost),m68k-lynx-lynxos)
|
ifeq ($(canonhost),m68k-lynx-lynxos)
|
||||||
canonhost := m68k-lynxos
|
canonhost := m68k-lynx
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(canonhost),sparc-sun-sunos4.1.3)
|
ifeq ($(canonhost),sparc-sun-sunos4.1.3)
|
||||||
|
@ -108,15 +108,14 @@ TARGETS = $(NATIVE) \
|
||||||
h8300-hms \
|
h8300-hms \
|
||||||
i386-aout \
|
i386-aout \
|
||||||
i386-lynx \
|
i386-lynx \
|
||||||
i386-netware \
|
i960-vxworks \
|
||||||
i960-vxworks i960-intel-nindy \
|
|
||||||
mips-idt-ecoff \
|
mips-idt-ecoff \
|
||||||
m68k-aout m68k-vxworks m68k-coff \
|
m68k-aout m68k-vxworks m68k-coff \
|
||||||
m68k-lynx \
|
m68k-lynx \
|
||||||
sh-hms \
|
sh-hms \
|
||||||
sparc-aout sparc-vxworks \
|
sparc-aout sparc-vxworks \
|
||||||
sparclite-aout sparclite-vxworks \
|
sparclite-aout sparclite-vxworks \
|
||||||
z8k-coff
|
sparclite-coff z8k-coff
|
||||||
GCC = gcc -O -pipe
|
GCC = gcc -O -pipe
|
||||||
all: all-cygnus
|
all: all-cygnus
|
||||||
endif
|
endif
|
||||||
|
@ -133,8 +132,8 @@ ifeq ($(canonhost),sparc-sun-solaris2)
|
||||||
TARGETS = $(NATIVE) \
|
TARGETS = $(NATIVE) \
|
||||||
a29k-amd-udi \
|
a29k-amd-udi \
|
||||||
i960-vxworks \
|
i960-vxworks \
|
||||||
m68k-aout m68k-coff \
|
m68k-aout m68k-coff m68k-vxworks \
|
||||||
m88k-coff \
|
m88k-coff \
|
||||||
mipsel-idt-ecoff \
|
mipsel-idt-ecoff \
|
||||||
sparclite-aout
|
sparclite-aout
|
||||||
CC = cc -Xs
|
CC = cc -Xs
|
||||||
|
@ -210,21 +209,20 @@ CC = cc
|
||||||
all: all-cygnus
|
all: all-cygnus
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(canonhost),i386-lynxos)
|
ifeq ($(canonhost),i386-lynx)
|
||||||
TARGETS = $(NATIVE)
|
TARGETS = $(NATIVE)
|
||||||
CC = /bin/gcc
|
CC = /bin/gcc
|
||||||
all: all-cygnus
|
all: all-cygnus
|
||||||
SHELL=/bin/bash
|
SHELL=/bin/bash
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(canonhost),m68k-lynxos)
|
ifeq ($(canonhost),m68k-lynx)
|
||||||
TARGETS = $(NATIVE)
|
TARGETS = $(NATIVE)
|
||||||
CC = /bin/gcc
|
CC = /bin/gcc
|
||||||
all: all-cygnus
|
all: all-cygnus
|
||||||
SHELL=/bin/bash
|
SHELL=/bin/bash
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
FLAGS_TO_PASS := \
|
FLAGS_TO_PASS := \
|
||||||
"GCC=$(GCC)" \
|
"GCC=$(GCC)" \
|
||||||
"CC=$(CC)" \
|
"CC=$(CC)" \
|
||||||
|
@ -333,6 +331,16 @@ all-cross:
|
||||||
echo " completed successfully" ; \
|
echo " completed successfully" ; \
|
||||||
done
|
done
|
||||||
|
|
||||||
|
do-dos:
|
||||||
|
$(MAKE) -f build-all.mk build=$(host) host=i386-go32 all-dos
|
||||||
|
all-dos:
|
||||||
|
@for i in $(TARGETS) ; do \
|
||||||
|
echo "building $(canonhost) cross to $$i" ; \
|
||||||
|
$(MAKE) -f test-build.mk $(FLAGS_TO_PASS) host=$(host) target=$$i do-dos $
|
||||||
|
(cyglog) && \
|
||||||
|
echo " completed successfully at `date`" ; \
|
||||||
|
done
|
||||||
|
|
||||||
config:
|
config:
|
||||||
@for i in $(TARGETS) ; do \
|
@for i in $(TARGETS) ; do \
|
||||||
if [ "$$i" = "native" ] ; then \
|
if [ "$$i" = "native" ] ; then \
|
||||||
|
|
|
@ -56,6 +56,12 @@ ifndef target
|
||||||
target := $(host)
|
target := $(host)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(patsubst %-lynx,lynx,$(host)),lynx)
|
||||||
|
SHELL := /bin/bash
|
||||||
|
GNU_MAKE := $(MAKE)
|
||||||
|
CONFIG_SHELL := /bin/bash
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq ($(build),$(host))
|
ifneq ($(build),$(host))
|
||||||
|
|
||||||
# We are building on a machine other than the host. We rely upon
|
# We are building on a machine other than the host. We rely upon
|
||||||
|
@ -80,14 +86,15 @@ HOST_PREFIX := $(build)-
|
||||||
HOST_PREFIX_1 := $(build)-
|
HOST_PREFIX_1 := $(build)-
|
||||||
LEX := flex
|
LEX := flex
|
||||||
MAKEINFO := makeinfo
|
MAKEINFO := makeinfo
|
||||||
|
MUNCH_NM := $(host)-nm
|
||||||
NM := $(host)-nm
|
NM := $(host)-nm
|
||||||
NM_FOR_TARGET := $(target)-nm
|
NM_FOR_TARGET := $(target)-nm
|
||||||
RANLIB := $(host)-ranlib
|
RANLIB := $(host)-ranlib
|
||||||
RANLIB_FOR_TARGET := $(target)-ranlib
|
RANLIB_FOR_TARGET := $(target)-ranlib
|
||||||
YACC := $(BISON)
|
YACC := $(BISON)
|
||||||
|
|
||||||
ifeq ($(build),hppa1.1-hp-hpux)
|
ifeq ($(host),i386-go32)
|
||||||
CC_FOR_BUILD := cc
|
MAKEINFOFLAGS = --no-split
|
||||||
endif
|
endif
|
||||||
|
|
||||||
FLAGS_TO_PASS := \
|
FLAGS_TO_PASS := \
|
||||||
|
@ -110,6 +117,7 @@ FLAGS_TO_PASS := \
|
||||||
"MAKEINFO=$(MAKEINFO)" \
|
"MAKEINFO=$(MAKEINFO)" \
|
||||||
"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
|
"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
|
||||||
"MF=$(MF)" \
|
"MF=$(MF)" \
|
||||||
|
"MUNCH_NM=$(MUNCH_NM)" \
|
||||||
"NM=$(NM)" \
|
"NM=$(NM)" \
|
||||||
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
|
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
|
||||||
"RANLIB=$(RANLIB)" \
|
"RANLIB=$(RANLIB)" \
|
||||||
|
@ -137,9 +145,9 @@ FLAGS_TO_PASS := \
|
||||||
"TIME=$(TIME)" \
|
"TIME=$(TIME)" \
|
||||||
"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
|
"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
|
||||||
"MF=$(MF)" \
|
"MF=$(MF)" \
|
||||||
"SHELL=$(SHELL)" \
|
|
||||||
"host=$(host)" \
|
"host=$(host)" \
|
||||||
"RELEASE_TAG=$(RELEASE_TAG)"
|
"RELEASE_TAG=$(RELEASE_TAG)" \
|
||||||
|
"SHELL=$(SHELL)"
|
||||||
|
|
||||||
configenv :=
|
configenv :=
|
||||||
|
|
||||||
|
@ -685,6 +693,7 @@ HOLES := \
|
||||||
rmdir \
|
rmdir \
|
||||||
sed \
|
sed \
|
||||||
sh \
|
sh \
|
||||||
|
sleep \
|
||||||
sort \
|
sort \
|
||||||
tar \
|
tar \
|
||||||
test \
|
test \
|
||||||
|
@ -717,6 +726,14 @@ ifeq ($(host),i386-go32)
|
||||||
DOS_HOLES := aout2exe doschk file
|
DOS_HOLES := aout2exe doschk file
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(host),i386-lynx)
|
||||||
|
MAKE_HOLE := make
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifeq ($(host),m68k-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.
|
### These things are also needed by a three-stage, but in this case, the GNU version of the tool is required.
|
||||||
PARTIAL_HOLES := \
|
PARTIAL_HOLES := \
|
||||||
$(MAKE_HOLE) \
|
$(MAKE_HOLE) \
|
||||||
|
@ -739,7 +756,8 @@ PARTIAL_HOLE_DIRS := \
|
||||||
/usr/progressive/bin \
|
/usr/progressive/bin \
|
||||||
$(PARTIAL_HOLE_DIRS) \
|
$(PARTIAL_HOLE_DIRS) \
|
||||||
/usr/vintage/bin \
|
/usr/vintage/bin \
|
||||||
/usr/unsupported/bin
|
/usr/unsupported/bin \
|
||||||
|
$(HOLE_DIRS)
|
||||||
|
|
||||||
$(HOLESDIR): $(holesys)-stamp-holes
|
$(HOLESDIR): $(holesys)-stamp-holes
|
||||||
|
|
||||||
|
@ -870,7 +888,7 @@ comparison-stage3to4: $(host)-stamp-4stage-compared
|
||||||
|
|
||||||
$(host)-stamp-3stage-compared:
|
$(host)-stamp-3stage-compared:
|
||||||
rm -f .bad-compare
|
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 \
|
for i in `cd $(STAGE3DIR) ; find . -name \*.o -print` ; do \
|
||||||
tail +10c $(STAGE2DIR)/$$i > foo1 ; \
|
tail +10c $(STAGE2DIR)/$$i > foo1 ; \
|
||||||
tail +10c $(STAGE3DIR)/$$i > foo2 ; \
|
tail +10c $(STAGE3DIR)/$$i > foo2 ; \
|
||||||
|
@ -903,7 +921,7 @@ endif
|
||||||
|
|
||||||
$(host)-stamp-4stage-compared:
|
$(host)-stamp-4stage-compared:
|
||||||
rm -f .bad-compare
|
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 \
|
for i in `cd $(STAGE4DIR) ; find . -name \*.o -print` ; do \
|
||||||
tail +10c $(STAGE3DIR)/$$i > foo1 ; \
|
tail +10c $(STAGE3DIR)/$$i > foo1 ; \
|
||||||
tail +10c $(STAGE4DIR)/$$i > foo2 ; \
|
tail +10c $(STAGE4DIR)/$$i > foo2 ; \
|
||||||
|
|
Loading…
Add table
Reference in a new issue