Module Name:    src
Committed By:   skrll
Date:           Sun Mar 30 07:29:22 UTC 2014

Modified Files:
        src/usr.sbin/crash: Makefile

Log Message:
Build everything on all arm variants


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/crash/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.26 src/usr.sbin/crash/Makefile:1.27
--- src/usr.sbin/crash/Makefile:1.26	Sat Mar 29 09:36:18 2014
+++ src/usr.sbin/crash/Makefile	Sun Mar 30 07:29:22 2014
@@ -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 @@ CWARNFLAGS.clang+=	-Wno-format
 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_FAMILY = x86
      || ${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

Reply via email to