Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/crash Build everything on all arm variants



details:   https://anonhg.NetBSD.org/src/rev/aea8c52ee926
branches:  trunk
changeset: 328293:aea8c52ee926
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Mar 30 07:29:22 2014 +0000

description:
Build everything on all arm variants

diffstat:

 usr.sbin/crash/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r e00c4a361248 -r aea8c52ee926 usr.sbin/crash/Makefile
--- a/usr.sbin/crash/Makefile   Sun Mar 30 05:53:12 2014 +0000
+++ b/usr.sbin/crash/Makefile   Sun Mar 30 07:29:22 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2014/03/29 09:36:18 skrll Exp $
+#      $NetBSD: Makefile,v 1.27 2014/03/30 07:29:22 skrll Exp $
 
 PROG=          crash
 MAN=           crash.8
@@ -9,13 +9,15 @@
 LDADD+=        -lutil -lkvm -ledit -lterminfo
 DPADD+=        ${LIBUTIL} ${LIBKVM} ${LIBEDIT} ${LIBTERMINFO}
 
+.include <bsd.own.mk>
+
 # some ddb kernel components need limited modifications.  for now,
 # punt if not noted as implemented here.
 .if    ${MACHINE} == "amd64" \
     || ${MACHINE} == "hppa" \
     || ${MACHINE} == "i386" \
     || ${MACHINE} == "sparc64" \
-    || (${MACHINE_ARCH} == "arm" && ${MACHINE} != "acorn26") \
+    || (${MACHINE_CPU} == "arm" && ${MACHINE} != "acorn26") \
     || ${MACHINE_ARCH} == "m68k"
 SRCS+= db_trace.c
 .if ${MACHINE_ARCH} != "m68k"
@@ -54,10 +56,10 @@
      || ${MACHINE} == "sparc64"
 MACHINE_FAMILY = sparc
 . else
-MACHINE_FAMILY = ${MACHINE}
+MACHINE_FAMILY = ${MACHINE_CPU}
 . endif
 
-.if ${MACHINE_ARCH} == "arm"
+.if ${MACHINE_CPU} == "arm"
 .PATH: ${S}/arch/arm/arm32
 SRCS+=disassem.c cpufunc_asm.S
 .endif



Home | Main Index | Thread Index | Old Index