[pkgsrc/trunk]: pkgsrc/mk override bootstrap-pkgsrc's incorrect OBJECT_FMT on...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/11f6b72f98da
branches:  trunk
changeset: 464471:11f6b72f98da
user:      grant <grant%pkgsrc.org@localhost>
date:      Wed Dec 10 13:59:07 2003 +0000

description:
override bootstrap-pkgsrc's incorrect OBJECT_FMT on NetBSD 1.4. from
krister.

XXX this should also be fixed in bootstrap-pkgsrc and bmake's
mk-files.

diffstat:

 mk/bsd.prefs.mk |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 020553584ee8 -r 11f6b72f98da mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Wed Dec 10 13:59:06 2003 +0000
+++ b/mk/bsd.prefs.mk   Wed Dec 10 13:59:07 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.133 2003/12/05 05:33:17 reed Exp $
+# $NetBSD: bsd.prefs.mk,v 1.134 2003/12/10 13:59:07 grant Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -152,7 +152,7 @@
 .include <bsd.own.mk>
 
 # /usr/share/mk/bsd.own.mk on NetBSD 1.3 does not define OBJECT_FMT
-.if ${MACHINE_PLATFORM:MNetBSD-1.3*} != ""
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.3*)
 .  if ${MACHINE_ARCH} == "alpha" || \
       ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
       ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
@@ -160,6 +160,17 @@
 .  else
 OBJECT_FMT?=           a.out
 .  endif
+# override what bootstrap-pkgsrc sets, which isn't right for NetBSD
+# 1.4.
+# XXX other ELF platforms in 1.4 need to be added to here.
+.elif !empty(MACHINE_PLATFORM:MNetBSD-1.4*)
+.  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} == "OpenBSD"