[src/trunk]: src/tools/gcc use NETBSDSRCDIR to find mpc/mpfr/gmp, not NEWCONF...

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

details:   https://anonhg.NetBSD.org/src/rev/51c61e5c622b
branches:  trunk
changeset: 787629:51c61e5c622b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jun 27 02:38:39 2013 +0000

description:
use NETBSDSRCDIR to find mpc/mpfr/gmp, not NEWCONFIGDIR, the
latter which is for finding a r/w directory to write to if
we're running from a read-only tree.

diffstat:

 tools/gcc/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 302c9028bf71 -r 51c61e5c622b tools/gcc/Makefile
--- a/tools/gcc/Makefile        Thu Jun 27 01:02:13 2013 +0000
+++ b/tools/gcc/Makefile        Thu Jun 27 02:38:39 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.54 2013/04/25 16:18:43 skrll Exp $
+#      $NetBSD: Makefile,v 1.55 2013/06/27 02:38:39 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -112,6 +112,8 @@
 CXXADDFLAGS=   --sysroot=${DESTDIR}
 CCADDFLAGS=    --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
 
+# NEWCONFIGDIR can be set to a read-write location of the source tree
+# in case the version being used is not.
 NEWCONFIGDIR?= ${.CURDIR}/../..
 MKNATIVE?=     ${.CURDIR}/mknative-gcc
 
@@ -129,9 +131,9 @@
 
 NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
 .if ${HAVE_GCC} >= 45
-MPC=           ${NEWCONFIGDIR}/external/lgpl2/mpc
-MPFR=          ${NEWCONFIGDIR}/external/lgpl3/mpfr
-GMP=           ${NEWCONFIGDIR}/external/lgpl3/gmp
+MPC=           ${NETBSDSRCDIR}/external/lgpl2/mpc
+MPFR=          ${NETBSDSRCDIR}/external/lgpl3/mpfr
+GMP=           ${NETBSDSRCDIR}/external/lgpl3/gmp
 MPCOBJ!=       cd ${MPC}/lib/libmpc && ${PRINTOBJDIR}
 MPFROBJ!=      cd ${MPFR}/lib/libmpfr && ${PRINTOBJDIR}
 GMPOBJ!=       cd ${GMP}/lib/libgmp && ${PRINTOBJDIR}