Module Name: src
Committed By: mrg
Date: Thu Jun 27 02:38:39 UTC 2013
Modified Files:
src/tools/gcc: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/tools/gcc/Makefile
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.54 src/tools/gcc/Makefile:1.55
--- src/tools/gcc/Makefile:1.54 Thu Apr 25 16:18:43 2013
+++ src/tools/gcc/Makefile Thu Jun 27 02:38:39 2013
@@ -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 @@ GCCSRCDIR=${.CURDIR}/../../external/gpl3
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-gcc: .native/.configure_done
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}
