Module Name: src
Committed By: mrg
Date: Fri Jun 28 08:30:10 UTC 2013
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
pass both NEWCONFIGDIR and NETBSDSRCDIR to mknative-gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/tools/gcc/Makefile
cvs rdiff -u -r1.70 -r1.71 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.55 src/tools/gcc/Makefile:1.56
--- src/tools/gcc/Makefile:1.55 Thu Jun 27 02:38:39 2013
+++ src/tools/gcc/Makefile Fri Jun 28 08:30:10 2013
@@ -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 @@ MKNATIVE?= ${.CURDIR}/mknative-gcc
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
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.70 src/tools/gcc/mknative-gcc:1.71
--- src/tools/gcc/mknative-gcc:1.70 Sun May 5 07:11:34 2013
+++ src/tools/gcc/mknative-gcc Fri Jun 28 08:30:10 2013
@@ -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 @@ _OUTDIRBASE="gnu"
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 #####
