diff options
| author | grant <grant@pkgsrc.org> | 2003-12-10 13:59:07 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-12-10 13:59:07 +0000 |
| commit | 33ac0ad0c8064eaa0dc417f3a8cab1c6654b287b (patch) | |
| tree | 5f2a16ad4c1fd15ad54c04b22af460f73d287b01 /mk/bsd.prefs.mk | |
| parent | 122c81902215380927c8bb3a53ba53aed7396307 (diff) | |
| download | pkgsrc-33ac0ad0c8064eaa0dc417f3a8cab1c6654b287b.tar.gz | |
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 (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 81e4a7b25f9..c70d78a3e6a 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ OBJECT_FMT?= Mach-O .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 @@ OBJECT_FMT?= ELF . 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" |