mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-01 17:00:36 +00:00
Code Issues Releases Activity

Remove BINFORMAT which is only set when building tools that need to have

Browse Source 
a default format.

Include /etc/objformat to get the installed object type if it exists
and if OBJFORMAT is not already defined.
This commit is contained in:
John Birrell 1998-08-30 20:35:24 +00:00
parent cdaa52cf0c
commit 3cba807609
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=38656
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
share/mk/bsd.own.mk
View File

@ -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