diff options
author | schmonz <schmonz@pkgsrc.org> | 2002-05-30 22:15:40 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2002-05-30 22:15:40 +0000 |
commit | 4a19db148138b9dfc320375b451920a650398b5b (patch) | |
tree | 1b09b2b8d6891ff264017170c67e17309739ded6 /mk/bsd.prefs.mk | |
parent | 0253a9d59104b7e5a97241d273daf22d5303557f (diff) | |
download | pkgsrc-4a19db148138b9dfc320375b451920a650398b5b.tar.gz |
On Darwin, before including <bsd.own.mk>, set OBJECT_FMT to "Mach-O".
(<bsd.own.mk> tries to set it to "ELF" otherwise.) The problem was
unmasked by -r1.983 of bsd.pkg.mk.
Approved by agc.
Diffstat (limited to 'mk/bsd.prefs.mk')
-rw-r--r-- | mk/bsd.prefs.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 64aaa3bce06..dafea8fa2b7 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.70 2002/03/18 05:46:42 fredb Exp $ +# $NetBSD: bsd.prefs.mk,v 1.71 2002/05/30 22:15:40 schmonz Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -124,6 +124,11 @@ NEED_OWN_INSTALL_TARGET=no USETOOLS= no MAKE_ENV+= USETOOLS=no +# Set this before <bsd.own.mk> does, since it doesn't know about Darwin +.if ${OPSYS} == "Darwin" +OBJECT_FMT?= Mach-O +.endif + .include <bsd.own.mk> # include the defaults file |