[src/trunk]: src/tools/gcc -I$DESTDIR/usr/include is escaping into the genera...

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

details:   https://anonhg.NetBSD.org/src/rev/f5366e0f29c6
branches:  trunk
changeset: 766862:f5366e0f29c6
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jul 03 12:11:32 2011 +0000

description:
-I$DESTDIR/usr/include is escaping into the generated files from
the native-gcc run.  add some sed commands to remove them.

diffstat:

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

diffs (72 lines):

diff -r ca2797b91380 -r f5366e0f29c6 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Sun Jul 03 11:41:30 2011 +0000
+++ b/tools/gcc/Makefile        Sun Jul 03 12:11:32 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.42 2011/07/01 01:27:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.43 2011/07/03 12:11:32 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -116,12 +116,14 @@
 bootstrap-libgcc: .configure_done
        @echo 'Creating files needed for libgcc by a native bootstrap build.'
        @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MODULE} \
-               ${.OBJDIR}/build ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM}
+               ${.OBJDIR}/build ${NEWCONFIGDIR} ${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}
+               ${.OBJDIR}/.native ${NEWCONFIGDIR} ${MACHINE_GNU_PLATFORM} \
+               ${DESTDIR}
 
 NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
 .if ${HAVE_GCC} >= 45
diff -r ca2797b91380 -r f5366e0f29c6 tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Sun Jul 03 11:41:30 2011 +0000
+++ b/tools/gcc/mknative-gcc    Sun Jul 03 12:11:32 2011 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.59 2011/07/03 06:47:12 mrg Exp $
+#      $NetBSD: mknative-gcc,v 1.60 2011/07/03 12:11:32 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of src/gnu/dist/gcc.
@@ -11,6 +11,7 @@
 _TOP=$3
 _PLATFORM=$4
 _ABI=$5
+_DESTDIR=$6
 _VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[  ]*,,'`
 _GNU_DIST=`cd ${_VPATH}; pwd`
 
@@ -29,6 +30,7 @@
        getvars gcc/Makefile \
                INCLUDES CRTSTUFF_CFLAGS CRTSTUFF_T_CFLAGS \
                tm_defines xm_file xm_defines \
+               | sed "s,-I$_DESTDIR/usr/include,," \
                | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH.mk
 }
 
@@ -387,7 +389,8 @@
                        SHLIB_MAPFILES SHLIB_NM_FLAGS \
                        EXTRA_HEADERS xm_defines \
                        tm_defines ${_extravars}
-       } | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
+       } | sed "s,-I$_DESTDIR/usr/include,," \
+       | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch${_archsubdir}/$MACHINE_ARCH.mk
 
        # Generate new style files.
        if [ -n "${MKNATIVE_LIBGCC_NEW}" ]; then
@@ -569,7 +572,8 @@
                        GTFILES GTFILES_LANG_DIR_NAMES \
                        tm_defines host_xm_file host_xm_defines tm_p_file \
                        target_cpu_default ${_extravars} ${_extravars2} \
-                       lang_specs_files ${_extravars3}
+                       lang_specs_files ${_extravars3} \
+                               | sed "s,-I$_DESTDIR/usr/include,," \
                getvars gcc/Makefile \
                        LIB2ADDEHDEP | sed 's/unwind.inc//'
                getvars gcc/Makefile \