Module Name: src
Committed By: skrll
Date: Thu Apr 18 05:20:01 UTC 2013
Modified Files:
src/tools/gcc: Makefile README.mknative
Log Message:
Use --with-{mpc,mpfr,gmp}-{lib,include} to avoid the LIBISPRIVATE=no
dance in mknative and avoid poluting the DESTDIR.
Update the README to reflect this.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/tools/gcc/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tools/gcc/README.mknative
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.52 src/tools/gcc/Makefile:1.53
--- src/tools/gcc/Makefile:1.52 Tue Sep 18 07:05:15 2012
+++ src/tools/gcc/Makefile Thu Apr 18 05:20:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2012/09/18 07:05:15 skrll Exp $
+# $NetBSD: Makefile,v 1.53 2013/04/18 05:20:00 skrll Exp $
.include <bsd.own.mk>
@@ -129,10 +129,20 @@ native-gcc: .native/.configure_done
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
.if ${HAVE_GCC} >= 45
+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}
+
NATIVE_CONFIGURE_ARGS+= \
- --with-mpc=${DESTDIR}/usr \
- --with-mpfr=${DESTDIR}/usr \
- --with-gmp=${DESTDIR}/usr
+ --with-mpc-lib=${MPCOBJ} \
+ --with-mpfr-lib=${MPFROBJ} \
+ --with-gmp-lib=${GMPOBJ} \
+ --with-mpc-include=${MPC}/dist/src \
+ --with-mpfr-include=${MPFR}/dist \
+ --with-gmp-include=${GMP}/lib/libgmp/arch/${MACHINE_ARCH}
. if ${MACHINE_ARCH} != "vax"
NATIVE_CONFIGURE_ARGS+= --enable-tls
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.14 src/tools/gcc/README.mknative:1.15
--- src/tools/gcc/README.mknative:1.14 Wed Dec 26 19:11:27 2012
+++ src/tools/gcc/README.mknative Thu Apr 18 05:20:00 2013
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.14 2012/12/26 19:11:27 martin Exp $
+$NetBSD: README.mknative,v 1.15 2013/04/18 05:20:00 skrll Exp $
This file describes how to bootstrap the native toolchain on a new NetBSD
platform (and how to update the new toolchain files, if needed). These
@@ -26,7 +26,7 @@ work.
to build.sh. Use -M instead. (The difference is only a minor layout/
pathname prefixe in the object directory pointed to bei either option.)
-3. In src/tools/gcc, do "nbmake-MACHINE bootstrap-libgcc".
+3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=45 bootstrap-libgcc".
This will create just enough glue in src/external/gpl3/gcc/lib/libgcc/arch
to make it possible to build, based on the toolchain built in
@@ -54,11 +54,7 @@ work.
8. In each of src/external/lgpl3/gmp/lib/libgmp,
src/external/lgpl3/mpfr/lib/libmpfr, src/external/lgpl2/mpc/lib/libmpc
- do "nbmake-MACHINE obj includes LIBISPRIVATE=no", and
- "nbmake-MACHINE dependall install".
-
- It is important to have LIBISPRIVATE=no while doing includes as this
- installs a header file that is not part of standard build.
+ do "nbmake-MACHINE obj dependall".
9. In src/lib, do
"nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=45".
