Module Name: src
Committed By: skrll
Date: Sun Feb 16 11:26:31 UTC 2014
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
The mpfr sources moved down into a src directory - deal with this in
mknative.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/tools/gcc/Makefile
cvs rdiff -u -r1.74 -r1.75 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.61 src/tools/gcc/Makefile:1.62
--- src/tools/gcc/Makefile:1.61 Thu Nov 28 12:08:57 2013
+++ src/tools/gcc/Makefile Sun Feb 16 11:26:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2013/11/28 12:08:57 mrg Exp $
+# $NetBSD: Makefile,v 1.62 2014/02/16 11:26:31 skrll Exp $
.include <bsd.own.mk>
@@ -142,7 +142,7 @@ NATIVE_CONFIGURE_ARGS+= \
--with-mpfr-lib=${MPFROBJ} \
--with-gmp-lib=${GMPOBJ} \
--with-mpc-include=${MPC}/dist/src \
- --with-mpfr-include=${MPFR}/dist \
+ --with-mpfr-include=${MPFR}/dist/src \
--with-gmp-include=${GMP}/lib/libgmp/arch/${MACHINE_ARCH}
. if ${MACHINE_ARCH} != "vax"
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.74 src/tools/gcc/mknative-gcc:1.75
--- src/tools/gcc/mknative-gcc:1.74 Thu Nov 28 12:08:57 2013
+++ src/tools/gcc/mknative-gcc Sun Feb 16 11:26:31 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.74 2013/11/28 12:08:57 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.75 2014/02/16 11:26:31 skrll Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -30,7 +30,7 @@ _OUTDIRBASE="gnu"
sanitise_includes () {
sed \
-e "s,-I$_DESTDIR/usr/include,,g" \
- -e "s,-I$_SRC/external/lgpl3/mpfr/dist,,g" \
+ -e "s,-I$_SRC/external/lgpl3/mpfr/dist/src,,g" \
-e "s,-I$_SRC/external/lgpl3/mpc/dist/src,,g" \
-e "s,-I$_SRC/external/lgpl3/gmp/lib/libgmp/arch/$MACHINE_ARCH,,g" \
-e "s,-I/usr/include/[^ ]*,,"
