Module Name: src
Committed By: mrg
Date: Sun Jul 3 12:11:33 UTC 2011
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
-I$DESTDIR/usr/include is escaping into the generated files from
the native-gcc run. add some sed commands to remove them.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/tools/gcc/Makefile
cvs rdiff -u -r1.59 -r1.60 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.42 src/tools/gcc/Makefile:1.43
--- src/tools/gcc/Makefile:1.42 Fri Jul 1 01:27:17 2011
+++ src/tools/gcc/Makefile Sun Jul 3 12:11:32 2011
@@ -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
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.59 src/tools/gcc/mknative-gcc:1.60
--- src/tools/gcc/mknative-gcc:1.59 Sun Jul 3 06:47:12 2011
+++ src/tools/gcc/mknative-gcc Sun Jul 3 12:11:32 2011
@@ -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 \
