Module Name: src
Committed By: matt
Date: Fri Mar 7 06:01:34 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Make MKCOMPAT default to yes for powerpc64.
Make MKCOMPATMODULES defaultt to no for evbppc && powerpc64.
To generate a diff of this commit:
cvs rdiff -u -r1.778 -r1.779 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.778 src/share/mk/bsd.own.mk:1.779
--- src/share/mk/bsd.own.mk:1.778 Thu Mar 6 11:21:05 2014
+++ src/share/mk/bsd.own.mk Fri Mar 7 06:01:34 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.778 2014/03/06 11:21:05 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.779 2014/03/07 06:01:34 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -864,8 +864,9 @@ MK${var}:= yes
#
# MK* options which have variable defaults.
#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
- ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
+ || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+ || ${MACHINE_ARCH} == "powerpc64"
MKCOMPAT?= yes
.elif !empty(MACHINE_ARCH:Mearm*)
MKCOMPAT?= no
@@ -876,7 +877,7 @@ MKCOMPAT:= no
#.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
-.if ${MACHINE} == "evbppc"
+.if ${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc64"
MKCOMPATMODULES?= yes
.else
MKCOMPATMODULES:= no