[src/trunk]: src/tools/gcc Avoid populating mknative output with gmp, mpfr, an...

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

details:   https://anonhg.NetBSD.org/src/rev/073574955587
branches:  trunk
changeset: 786303:073574955587
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Apr 25 16:18:43 2013 +0000

description:
Avoid populating mknative output with gmp,mpfr, and mpc source
directories

diffstat:

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

diffs (59 lines):

diff -r fe3a5fd88080 -r 073574955587 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Thu Apr 25 15:39:26 2013 +0000
+++ b/tools/gcc/Makefile        Thu Apr 25 16:18:43 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.53 2013/04/18 05:20:00 skrll Exp $
+#      $NetBSD: Makefile,v 1.54 2013/04/25 16:18:43 skrll Exp $
 
 .include <bsd.own.mk>
 
@@ -129,9 +129,9 @@
 
 NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
 .if ${HAVE_GCC} >= 45
-MPC=           ${NETBSDSRCDIR}/external/lgpl2/mpc
-MPFR=          ${NETBSDSRCDIR}/external/lgpl3/mpfr
-GMP=           ${NETBSDSRCDIR}/external/lgpl3/gmp
+MPC=           ${NEWCONFIGDIR}/external/lgpl2/mpc
+MPFR=          ${NEWCONFIGDIR}/external/lgpl3/mpfr
+GMP=           ${NEWCONFIGDIR}/external/lgpl3/gmp
 MPCOBJ!=       cd ${MPC}/lib/libmpc && ${PRINTOBJDIR}
 MPFROBJ!=      cd ${MPFR}/lib/libmpfr && ${PRINTOBJDIR}
 GMPOBJ!=       cd ${GMP}/lib/libgmp && ${PRINTOBJDIR}
diff -r fe3a5fd88080 -r 073574955587 tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Thu Apr 25 15:39:26 2013 +0000
+++ b/tools/gcc/mknative-gcc    Thu Apr 25 16:18:43 2013 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.68 2012/09/25 06:55:10 skrll Exp $
+#      $NetBSD: mknative-gcc,v 1.69 2013/04/25 16:18:43 skrll Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -394,8 +394,12 @@
                        SHLIB_MAPFILES SHLIB_NM_FLAGS \
                        EXTRA_HEADERS xm_defines \
                        tm_defines ${_extravars}
-       } | sed "s,-I$_DESTDIR/usr/include,,g" \
-       | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
+       } | 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" \
+               | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
 
        # Generate new style files.
        if [ -n "${MKNATIVE_LIBGCC_NEW}" ]; then
@@ -600,7 +604,10 @@
                        tm_defines host_xm_file host_xm_defines tm_p_file \
                        target_cpu_default ${_extravars} ${_extravars2} \
                        lang_specs_files ${_extravars3} \
-                               | sed "s,-I$_DESTDIR/usr/include,,g"
+                               | 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"
                getvars gcc/Makefile \
                        LIB2ADDEHDEP | sed 's/unwind.inc//'
                getvars gcc/Makefile \