mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
Default to aout only on i386. Before we defaulted to elf only on
Alpha. This is a minor, but important distinction. Should be a no-op to the install base. If OBJFORMAT is set elsewhere, things work exactly as they did before.
This commit is contained in:
parent
52e7cc0a90
commit
830775aaf9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=40526
@ -1,5 +1,5 @@
|
||||
# from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91
|
||||
# $Id: bsd.lib.mk,v 1.78 1998/08/30 20:33:27 jb Exp $
|
||||
# $Id: bsd.lib.mk,v 1.79 1998/09/20 19:49:44 obrien Exp $
|
||||
#
|
||||
|
||||
.if !target(__initialized__)
|
||||
@ -10,10 +10,10 @@ __initialized__:
|
||||
.endif
|
||||
|
||||
# Default executable format
|
||||
.if ${MACHINE} == "alpha"
|
||||
OBJFORMAT?= elf
|
||||
.else
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
OBJFORMAT?= aout
|
||||
.else
|
||||
OBJFORMAT?= elf
|
||||
.endif
|
||||
|
||||
.if exists(${.CURDIR}/shlib_version)
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id: bsd.own.mk,v 1.18 1998/08/31 23:34:37 jb Exp $
|
||||
# $Id: bsd.own.mk,v 1.19 1998/09/14 08:34:45 obrien Exp $
|
||||
#
|
||||
# The include file <bsd.own.mk> set common variables for owner,
|
||||
# group, mode, and directories. Defaults are in brackets.
|
||||
@ -131,10 +131,10 @@ MACHINE_ARCH?= i386
|
||||
.endif
|
||||
|
||||
# Default executable format
|
||||
.if ${MACHINE_ARCH} == "alpha"
|
||||
OBJFORMAT?= elf
|
||||
.else
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
OBJFORMAT?= aout
|
||||
.else
|
||||
OBJFORMAT?= elf
|
||||
.endif
|
||||
|
||||
# Binaries
|
||||
|
Loading…
Reference in New Issue
Block a user