diff options
| author | jb <jb@FreeBSD.org> | 1998-01-21 01:03:51 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 1998-01-21 01:03:51 +0000 |
| commit | 1ee427586a6b33df8a82d8e3adcce1fe5c75caa5 (patch) | |
| tree | 9b73a9c4278ac5731c01555f8293beb6e833a8dd /share | |
| parent | 151ed161b73f50a87234b4a6b79999f30bf43c07 (diff) | |
| download | FreeBSD-src-1ee427586a6b33df8a82d8e3adcce1fe5c75caa5.zip FreeBSD-src-1ee427586a6b33df8a82d8e3adcce1fe5c75caa5.tar.gz | |
FreeBSD's make knows about the MACHINE, but not the MACHINE_ARCH unless
it is built with this defined (which it isn't by default). This change
to sys.mk treats the absence of MACHINE_ARCH as i386 on the assumption
that it will be appropriately defined (as something else) on any other
architecture. When building FreeBSD's make with NetBSD tools, both
MACHINE and MACHINE_ARCH are correctly set (e.g. when bootstrapping
FreeBSD's make on NetBSD/mvme68k, MACHINE=mvme68k and
MACHINE_ARCH=m68k). This isn't really needed for the alpha which
has both defined as 'alpha', but I thought it was worth getting the
distinction between a MACHINE and a MACHINE_ARCH correct now.
Now, shouldn't PC98 have MACHINE=pc98 and MACHINE_ARCH=i386 ??!!
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/sys.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/share/mk/sys.mk b/share/mk/sys.mk index a185f6e..9af0833 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,5 +1,5 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 -# $Id: sys.mk,v 1.26 1997/09/05 11:45:15 peter Exp $ +# $Id: sys.mk,v 1.27 1998/01/13 06:00:54 jb Exp $ unix ?= We run FreeBSD, not UNIX. @@ -94,8 +94,15 @@ YFLAGS ?= YFLAGS ?= -d .endif +# FreeBSD/i386 as traditionally been built with a version of make +# which knows MACHINE, but not MACHINE_ARCH. When building on other +# architectures, assume that the version of make being used has an +# explicit MACHINE_ARCH setting and treat a missing MACHINE_ARCH +# as an i386 architecture. +MACHINE_ARCH?= i386 + # Default executable format -.if ${MACHINE} == "alpha" +.if ${MACHINE_ARCH} == "alpha" BINFORMAT ?= elf .else BINFORMAT ?= aout |
