diff options
| author | jb <jb@FreeBSD.org> | 1998-08-30 20:35:24 +0000 |
|---|---|---|
| committer | jb <jb@FreeBSD.org> | 1998-08-30 20:35:24 +0000 |
| commit | 3ec882f890162cf9723d586e919054355a55ead7 (patch) | |
| tree | 571efcf299fa9b8bc90c96f40abe538bc31a1441 /share/mk | |
| parent | d87af5ad40ef0ddb6229db138314eee31c1c1823 (diff) | |
| download | FreeBSD-src-3ec882f890162cf9723d586e919054355a55ead7.zip FreeBSD-src-3ec882f890162cf9723d586e919054355a55ead7.tar.gz | |
Remove BINFORMAT which is only set when building tools that need to have
a default format.
Include /etc/objformat to get the installed object type if it exists
and if OBJFORMAT is not already defined.
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.own.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 7838fa1..45c51e5 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $Id: bsd.own.mk,v 1.15 1998/08/03 08:28:14 bde Exp $ +# $Id: bsd.own.mk,v 1.16 1998/08/18 00:50:36 jb Exp $ # # The include file <bsd.own.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -28,10 +28,6 @@ # own install script so that the entire system can be made # stripped/not-stripped using a single knob. [-s] # -# -# BINFORMAT Default executable format generated by tools. -# [elf on alpha, aout otherwise] -# # OBJFORMAT Default object format that selects which set of tools to run. # [elf on alpha, aout otherwise] # @@ -125,12 +121,19 @@ # from here. It has normally already been defined in sys.mk. MACHINE_ARCH?= i386 +# +# The build tools are indirected by /usr/bin/objformat which determines the +# object format from the OBJFORMAT environment variable and if this is not +# defined, it reads /etc/objectformat. +# +.if exists(/etc/objectformat) && !defined(OBJFORMAT) +.include "/etc/objectformat" +.endif + # Default executable format .if ${MACHINE_ARCH} == "alpha" -BINFORMAT?= elf OBJFORMAT?= elf .else -BINFORMAT?= aout OBJFORMAT?= aout .endif @@ -140,7 +143,7 @@ BINGRP?= bin BINMODE?= 555 NOBINMODE?= 444 -.if ${BINFORMAT} == aout +.if ${OBJFORMAT} == aout LIBDIR?= /usr/lib/aout .else LIBDIR?= /usr/lib |
