[src/trunk]: src/external Use GMP_MACHINE_ARCH which is MACHINE_ARCH with arm...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f280252a8c3
branches:  trunk
changeset: 789041:1f280252a8c3
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 05 01:46:57 2013 +0000

description:
Use GMP_MACHINE_ARCH which is MACHINE_ARCH with arm substituted for armv[467].

diffstat:

 external/lgpl2/mpc/lib/libmpc/Makefile   |  5 +++--
 external/lgpl3/mpfr/lib/libmpfr/Makefile |  5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 2546e2e0f207 -r 1f280252a8c3 external/lgpl2/mpc/lib/libmpc/Makefile
--- a/external/lgpl2/mpc/lib/libmpc/Makefile    Mon Aug 05 00:59:19 2013 +0000
+++ b/external/lgpl2/mpc/lib/libmpc/Makefile    Mon Aug 05 01:46:57 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2011/09/21 02:06:42 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2013/08/05 01:53:42 matt Exp $
 
 .include <bsd.init.mk>
 
@@ -94,7 +94,8 @@
 CPPFLAGS+=     -I${.CURDIR}
 
 # Find <mpfr.h> and <gmp.h>
-CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${MACHINE_ARCH}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
 CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/mpfr/dist
 
 .include <bsd.lib.mk>
diff -r 2546e2e0f207 -r 1f280252a8c3 external/lgpl3/mpfr/lib/libmpfr/Makefile
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile  Mon Aug 05 00:59:19 2013 +0000
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile  Mon Aug 05 01:46:57 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2012/08/10 16:10:29 joerg Exp $
+#      $NetBSD: Makefile,v 1.11 2013/08/05 01:46:57 matt Exp $
 
 .include <bsd.init.mk>
 
@@ -476,7 +476,8 @@
                -DHAVE_ATTRIBUTE_MODE=1
 
 # Find <gmp.h>
-CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${MACHINE_ARCH}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
 
 # XXX
 # XXX XXX check mips*