diff options
author | imp <imp@FreeBSD.org> | 1998-10-19 20:09:17 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 1998-10-19 20:09:17 +0000 |
commit | f651fc063e97f67f9553790548170225307e2c0b (patch) | |
tree | 4d3cb62aaefb2821c408611d899d56f4d47ede9b /share | |
parent | face6e927780c3680f0315b297cc7108445cf37e (diff) | |
download | FreeBSD-src-f651fc063e97f67f9553790548170225307e2c0b.zip FreeBSD-src-f651fc063e97f67f9553790548170225307e2c0b.tar.gz |
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.
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.lib.mk | 8 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 7e69c87..da0d023 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -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) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index fece284..b4e0501 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -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 |