Module Name:    src
Committed By:   matt
Date:           Mon Aug  5 03:22:45 UTC 2013

Modified Files:
        src/external/gpl3/gcc/usr.bin: Makefile.inc

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


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/Makefile.inc

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

Modified files:

Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.12 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.13
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.12	Sun Dec  2 12:55:27 2012
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc	Mon Aug  5 03:22:45 2013
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile.inc,v 1.12 2012/12/02 12:55:27 apb Exp $
+#	$NetBSD: Makefile.inc,v 1.13 2013/08/05 03:22:45 matt Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
 
 .include <bsd.own.mk>
 
+GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+
 TOP=		${NETBSDSRCDIR}
 DIST=		${TOP}/external/gpl3/gcc/dist
 
@@ -14,7 +16,7 @@ CPPFLAGS+=	-DLOCALEDIR=\"/usr/share/loca
 HOST_CPPFLAGS+=	-I${.CURDIR}/..
 
 # Link in the GMP/MPFR/MPC headers since we don't install them
-BUILDSYMLINKS+=	${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${MACHINE_ARCH}/gmp.h gmp.h
+BUILDSYMLINKS+=	${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}/gmp.h gmp.h
 BUILDSYMLINKS+=	${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/mpfr.h mpfr.h
 BUILDSYMLINKS+=	${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/mpf2mpfr.h mpf2mpfr.h
 BUILDSYMLINKS+=	${NETBSDSRCDIR}/external/lgpl2/mpc/dist/src/mpc.h mpc.h

Reply via email to