Module Name: src
Committed By: joerg
Date: Sat Jun 16 19:19:14 UTC 2012
Modified Files:
src/lib/csu: Makefile
Log Message:
Unbreak compat.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/csu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/Makefile
diff -u src/lib/csu/Makefile:1.30 src/lib/csu/Makefile:1.31
--- src/lib/csu/Makefile:1.30 Sat Jun 16 18:19:39 2012
+++ src/lib/csu/Makefile Sat Jun 16 19:19:14 2012
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.30 2012/06/16 18:19:39 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2012/06/16 19:19:14 joerg Exp $
.include <bsd.own.mk>
.if ${USE_COMPILERCRTSTUFF} != "yes"
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc)
-ARCHDIR:= ${.CURDIR}/arch/${MACHINE_ARCH}
+.if defined(CSU_MACHINE_ARCH)
+. if !exists(${.CURDIR}/arch/${CSU_MACHINE_ARCH}/Makefile.inc)
+. error CSU_MACHINE_ARCH (${CSU_MACHINE_ARCH}) is unsupported
+. endif
+.elif exists(${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc)
+CSU_MACHINE_ARCH= ${MACHINE_ARCH}
.elif exists(${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc)
-ARCHDIR:= ${.CURDIR}/arch/${MACHINE_CPU}
+CSU_MACHINE_ARCH= ${MACHINE_CPU}
.else
.error Architecture (${MACHINE_ARCH} or ${MACHINE_CPU}) unsupported
.endif
+ARCHDIR:= ${.CURDIR}/arch/${CSU_MACHINE_ARCH}
+
.PATH: ${ARCHDIR}
. include "${ARCHDIR}/Makefile.inc"
