[src/trunk]: src/tools/gcc Use --with-{mpc, mpfr, gmp}-{lib, include} to avoid t...

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

details:   https://anonhg.NetBSD.org/src/rev/451d4b32b977
branches:  trunk
changeset: 786171:451d4b32b977
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Apr 18 05:20:00 2013 +0000

description:
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.

diffstat:

 tools/gcc/Makefile        |  18 ++++++++++++++----
 tools/gcc/README.mknative |  10 +++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diffs (64 lines):

diff -r 3ee1be709ee3 -r 451d4b32b977 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Thu Apr 18 02:55:17 2013 +0000
+++ b/tools/gcc/Makefile        Thu Apr 18 05:20:00 2013 +0000
@@ -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_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
diff -r 3ee1be709ee3 -r 451d4b32b977 tools/gcc/README.mknative
--- a/tools/gcc/README.mknative Thu Apr 18 02:55:17 2013 +0000
+++ b/tools/gcc/README.mknative Thu Apr 18 05:20:00 2013 +0000
@@ -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 @@
    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 @@
 
 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".