[src/trunk]: src/tools/gcc pass both NEWCONFIGDIR and NETBSDSRCDIR to mknativ...

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

details:   https://anonhg.NetBSD.org/src/rev/f2674071fd0a
branches:  trunk
changeset: 787680:f2674071fd0a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 28 08:30:10 2013 +0000

description:
pass both NEWCONFIGDIR and NETBSDSRCDIR to mknative-gcc.

diffstat:

 tools/gcc/Makefile     |  10 +++++-----
 tools/gcc/mknative-gcc |  16 +++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diffs (66 lines):

diff -r e2509e68b5d9 -r f2674071fd0a tools/gcc/Makefile
--- a/tools/gcc/Makefile        Fri Jun 28 07:59:32 2013 +0000
+++ b/tools/gcc/Makefile        Fri Jun 28 08:30:10 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.55 2013/06/27 02:38:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.56 2013/06/28 08:30:10 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -120,14 +120,14 @@
 bootstrap-libgcc: .configure_done
        @echo 'Creating files needed for libgcc by a native bootstrap build.'
        @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MKNATIVE_TARGET} \
-               ${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
-               ${DESTDIR}
+               ${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
+               ${MACHINE_GNU_PLATFORM} ${DESTDIR}
 
 native-gcc: .native/.configure_done
        @echo 'Extracting GNU GCC configury for a native toolchain.'
        @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
-               ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
-               ${DESTDIR}
+               ${.OBJDIR}/.native ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
+               ${MACHINE_GNU_PLATFORM} ${DESTDIR}
 
 NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
 .if ${HAVE_GCC} >= 45
diff -r e2509e68b5d9 -r f2674071fd0a tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Fri Jun 28 07:59:32 2013 +0000
+++ b/tools/gcc/mknative-gcc    Fri Jun 28 08:30:10 2013 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.70 2013/05/05 07:11:34 skrll Exp $
+#      $NetBSD: mknative-gcc,v 1.71 2013/06/28 08:30:10 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -9,9 +9,10 @@
 
 _TMPDIR=$2
 _TOP=$3
-_PLATFORM=$4
-_DESTDIR=$5
-_ABI=$6
+_SRC=$4
+_PLATFORM=$5
+_DESTDIR=$6
+_ABI=$7
 _VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[  ]*,,'`
 _GNU_DIST=`cd ${_VPATH}; pwd`
 
@@ -29,9 +30,10 @@
 sanitise_includes () {
        sed \
                -e "s,-I$_DESTDIR/usr/include,,g" \
-               -e "s,-I$_TOP/external/lgpl3/mpfr/dist,,g" \
-               -e "s,-I$_TOP/external/lgpl2/mpc/dist/src,,g" \
-               -e "s,-I$_TOP/external/lgpl3/gmp/lib/libgmp/arch/$MACHINE_ARCH,,g"
+               -e "s,-I$_SRC/external/lgpl3/mpfr/dist,,g" \
+               -e "s,-I$_SRC/external/lgpl2/mpc/dist/src,,g" \
+               -e "s,-I$_SRC/external/lgpl3/gmp/lib/libgmp/arch/$MACHINE_ARCH,,g" \
+               -e "s,-I/usr/include/[^         ]*,,"
 }
 
 ##### gnu/lib/crtstuff #####