diff options
| author | bde <bde@FreeBSD.org> | 1998-08-03 08:28:14 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-08-03 08:28:14 +0000 |
| commit | c4e1dd04fba1896d47ede3d3cecfb37038aa24f2 (patch) | |
| tree | 25e15e1f9ab217dc25c92d5c71d2c706f6f1f1b1 /share/mk/bsd.own.mk | |
| parent | 4d4ca48c8596d66cc9f4b94f613b1064a2fca8ae (diff) | |
| download | FreeBSD-src-c4e1dd04fba1896d47ede3d3cecfb37038aa24f2.zip FreeBSD-src-c4e1dd04fba1896d47ede3d3cecfb37038aa24f2.tar.gz | |
Fixed building -current under 2.2.6 using `make world'. Moved some
recently added definitions from sys.mk to bsd.own.mk. Include the
src-relative bsd.own.mk in src/Makefile to pick up all new definitions.
Don't check that MACHINE_ARCH is defined in src/Makefile, since it is
(and should have been) guaranteed to be defined.
Diffstat (limited to 'share/mk/bsd.own.mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2d01cf1..9e28b3e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $Id: bsd.own.mk,v 1.13 1998/03/19 13:32:43 bde Exp $ +# $Id: bsd.own.mk,v 1.14 1998/05/26 20:12:54 sos Exp $ # # The include file <bsd.own.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -29,6 +29,8 @@ # stripped/not-stripped using a single knob. [-s] # # +# BINFORMAT Default executable format. [elf on alpha, aout otherwise] +# # # BINOWN Binary owner. [bin] # @@ -116,6 +118,17 @@ # # INCLUDEDIR Base path for standard C include files [/usr/include] +# This is only here for bootstrapping and is not officially exported +# from here. It has normally already been defined in sys.mk. +MACHINE_ARCH?= i386 + +# Default executable format +.if ${MACHINE_ARCH} == "alpha" +BINFORMAT?= elf +.else +BINFORMAT?= aout +.endif + # Binaries BINOWN?= bin BINGRP?= bin |
