[src/trunk]: src/tools/gcc The mpfr sources moved down into a src directory -...

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

details:   https://anonhg.NetBSD.org/src/rev/c3eb5c858f0a
branches:  trunk
changeset: 326751:c3eb5c858f0a
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Feb 16 11:26:31 2014 +0000

description:
The mpfr sources moved down into a src directory - deal with this in
mknative.

diffstat:

 tools/gcc/Makefile     |  4 ++--
 tools/gcc/mknative-gcc |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r f82843e96651 -r c3eb5c858f0a tools/gcc/Makefile
--- a/tools/gcc/Makefile        Sun Feb 16 09:50:25 2014 +0000
+++ b/tools/gcc/Makefile        Sun Feb 16 11:26:31 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.61 2013/11/28 12:08:57 mrg Exp $
+#      $NetBSD: Makefile,v 1.62 2014/02/16 11:26:31 skrll Exp $
 
 .include <bsd.own.mk>
 
@@ -142,7 +142,7 @@
                        --with-mpfr-lib=${MPFROBJ} \
                        --with-gmp-lib=${GMPOBJ} \
                        --with-mpc-include=${MPC}/dist/src \
-                       --with-mpfr-include=${MPFR}/dist \
+                       --with-mpfr-include=${MPFR}/dist/src \
                        --with-gmp-include=${GMP}/lib/libgmp/arch/${MACHINE_ARCH}
 
 .  if ${MACHINE_ARCH} != "vax"
diff -r f82843e96651 -r c3eb5c858f0a tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Sun Feb 16 09:50:25 2014 +0000
+++ b/tools/gcc/mknative-gcc    Sun Feb 16 11:26:31 2014 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.74 2013/11/28 12:08:57 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.75 2014/02/16 11:26:31 skrll Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -30,7 +30,7 @@
 sanitise_includes () {
        sed \
                -e "s,-I$_DESTDIR/usr/include,,g" \
-               -e "s,-I$_SRC/external/lgpl3/mpfr/dist,,g" \
+               -e "s,-I$_SRC/external/lgpl3/mpfr/dist/src,,g" \
                -e "s,-I$_SRC/external/lgpl3/mpc/dist/src,,g" \
                -e "s,-I$_SRC/external/lgpl3/gmp/lib/libgmp/arch/$MACHINE_ARCH,,g" \
                -e "s,-I/usr/include/[^         ]*,,"