diff options
| author | bde <bde@FreeBSD.org> | 1998-12-06 17:14:37 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-12-06 17:14:37 +0000 |
| commit | f64d6c31be6ef252e7a71ccc59875527105ac8b4 (patch) | |
| tree | c779c92fa978d434f33ab4c884ee7ee54ced8b24 /share | |
| parent | f75a5f3e3b2f56d11edebb7b096ee8fed79aad43 (diff) | |
| download | FreeBSD-src-f64d6c31be6ef252e7a71ccc59875527105ac8b4.zip FreeBSD-src-f64d6c31be6ef252e7a71ccc59875527105ac8b4.tar.gz | |
Removed bitrotted code for setting OBJFORMAT.
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.lib.mk | 9 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 5 |
2 files changed, 2 insertions, 12 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 8b870bd..c783a62 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.80 1998/10/19 20:09:17 imp Exp $ +# $Id: bsd.lib.mk,v 1.81 1998/11/18 00:48:11 jdp Exp $ # .if !target(__initialized__) @@ -9,13 +9,6 @@ __initialized__: .endif .endif -# Default executable format -.if ${MACHINE_ARCH} == "i386" -OBJFORMAT?= aout -.else -OBJFORMAT?= elf -.endif - .if exists(${.CURDIR}/shlib_version) SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major .if ${OBJFORMAT} == aout diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index e2d1e4b..783192d 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $Id: bsd.prog.mk,v 1.78 1998/09/07 05:55:02 jb Exp $ +# $Id: bsd.prog.mk,v 1.79 1998/10/18 09:35:17 obrien Exp $ .if !target(__initialized__) __initialized__: @@ -8,9 +8,6 @@ __initialized__: .endif .endif -# Default executable format -OBJFORMAT?= aout - .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .s .S CFLAGS+=${COPTS} ${DEBUG_FLAGS} |
