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

This commit is contained in:
matt 2013-08-05 01:46:57 +00:00
parent 7ef13c34d9
commit 10ba3edce2
2 changed files with 6 additions and 4 deletions

View File

@ -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 @@ SRCS= \
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>

View File

@ -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 @@ CPPFLAGS+= -I. \
-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*