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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/csu/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/lib/csu/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- src/lib/csu/Makefile	2014/04/22 13:20:58	1.34
+++ src/lib/csu/Makefile	2014/08/10 23:25:49	1.35
@@ -1,17 +1,18 @@
-#	$NetBSD: Makefile,v 1.34 2014/04/22 13:20:58 joerg Exp $
+#	$NetBSD: Makefile,v 1.35 2014/08/10 23:25:49 matt Exp $
 
 .include <bsd.own.mk>
 
 CSU_MACHINE_ARCH?=	${MACHINE_ARCH}
+CSU_MACHINE_CPU?=	${MACHINE_CPU}
 
 .if !empty(CSU_MACHINE_ARCH:Mearm*)
 ARCHDIR:=	${.CURDIR}/arch/earm
 .elif exists(${.CURDIR}/arch/${CSU_MACHINE_ARCH}/Makefile.inc)
 ARCHDIR:=	${.CURDIR}/arch/${CSU_MACHINE_ARCH}
-.elif exists(${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc)
-ARCHDIR:=	${.CURDIR}/arch/${MACHINE_CPU}
+.elif exists(${.CURDIR}/arch/${CSU_MACHINE_CPU}/Makefile.inc)
+ARCHDIR:=	${.CURDIR}/arch/${CSU_MACHINE_CPU}
 .else
-.error Architecture (${CSU_MACHINE_ARCH} or ${MACHINE_CPU}) unsupported
+.error Architecture (${CSU_MACHINE_ARCH} or ${CSU_MACHINE_CPU}) unsupported
 .endif