Source-Changes-HG archive

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

[src/trunk]: src/lib/csu Unbreak compat.



details:   https://anonhg.NetBSD.org/src/rev/384ed867b8b0
branches:  trunk
changeset: 779763:384ed867b8b0
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat Jun 16 19:19:14 2012 +0000

description:
Unbreak compat.

diffstat:

 lib/csu/Makefile |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r e38423466315 -r 384ed867b8b0 lib/csu/Makefile
--- a/lib/csu/Makefile  Sat Jun 16 18:19:39 2012 +0000
+++ b/lib/csu/Makefile  Sat Jun 16 19:19:14 2012 +0000
@@ -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"
 



Home | Main Index | Thread Index | Old Index