diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-21 17:49:47 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-21 17:49:47 +0000 |
| commit | d52785d9bf4f449c6148fee26d5ffeb3abfa8db0 (patch) | |
| tree | 14a35a406ebc7d456cafc43f604c5a7dc925ee7c /mk | |
| parent | 8ca99c83ae3366f464a7a715749178ef1174b614 (diff) | |
| download | pkgsrc-d52785d9bf4f449c6148fee26d5ffeb3abfa8db0.tar.gz | |
Move the definition of OBJECT_FMT for NetBSD-1.3.x systems ahead of the
inclusion of defs.*.mk so that they can conditionalize on OBJECT_FMT.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index dafea8fa2b7..42611d414d3 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.71 2002/05/30 22:15:40 schmonz Exp $ +# $NetBSD: bsd.prefs.mk,v 1.72 2002/06/21 17:49:47 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -129,6 +129,17 @@ MAKE_ENV+= USETOOLS=no OBJECT_FMT?= Mach-O .endif +# /usr/share/mk/bsd.own.mk on NetBSD 1.3 does not define OBJECT_FMT +.if ${MACHINE_PLATFORM:MNetBSD-1.3*} != "" +.if ${MACHINE_ARCH} == "alpha" || \ +${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \ +${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" +OBJECT_FMT?= ELF +.else +OBJECT_FMT?= a.out +.endif +.endif + .include <bsd.own.mk> # include the defaults file @@ -140,17 +151,6 @@ OBJECT_FMT?= Mach-O .include "${.CURDIR}/mk/bsd.pkg.defaults.mk" .endif -# /usr/share/mk/bsd.own.mk on NetBSD 1.3 does not define OBJECT_FMT -.if ${MACHINE_PLATFORM:MNetBSD-1.3*} != "" -.if ${MACHINE_ARCH} == "alpha" || \ -${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \ -${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" -OBJECT_FMT?=ELF -.else -OBJECT_FMT?=a.out -.endif -.endif - .if ${OPSYS} == "NetBSD" . if ${OBJECT_FMT} == "ELF" && \ (${MACHINE_GNU_ARCH} == "arm" || \ |