[src/trunk]: src/tools Decouple binutils build from HAVE_GCC. Merge common fr...

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

details:   https://anonhg.NetBSD.org/src/rev/979c75b4025c
branches:  trunk
changeset: 780891:979c75b4025c
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 10 16:13:36 2012 +0000

description:
Decouple binutils build from HAVE_GCC. Merge common fragments of
HAVE_GCC and HAVE_PCC.

diffstat:

 tools/Makefile |  22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r cbb9730517a3 -r 979c75b4025c tools/Makefile
--- a/tools/Makefile    Fri Aug 10 16:12:20 2012 +0000
+++ b/tools/Makefile    Fri Aug 10 16:13:36 2012 +0000
@@ -1,35 +1,45 @@
-#      $NetBSD: Makefile,v 1.155 2011/11/03 07:42:56 joerg Exp $
+#      $NetBSD: Makefile,v 1.156 2012/08/10 16:13:36 joerg Exp $
 
 .include <bsd.own.mk>
 
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
 TOOLCHAIN_BITS= gmake .WAIT
+.endif
+
 .if ${TOOLCHAIN_MISSING} == "no"
+.if defined(HAVE_GCC)
 .if ${HAVE_GCC} >= 45
 TOOLCHAIN_BITS+= gmp .WAIT
 TOOLCHAIN_BITS+= mpfr .WAIT
 TOOLCHAIN_BITS+= mpc .WAIT
 .endif
+.endif
+.endif
+
+.if ${TOOLCHAIN_MISSING} == "no"
 TOOLCHAIN_BITS+= binutils .WAIT
+.endif
+
+.if defined(HAVE_GCC)
+.if ${TOOLCHAIN_MISSING} == "no"
 TOOLCHAIN_BITS+= gcc
 .  if ${MKCROSSGDB:Uno} != "no"
 TOOLCHAIN_BITS+= gdb
 .  endif
-TOOLCHAIN_BITS+= .WAIT dbsym mdsetimage
+TOOLCHAIN_BITS+= .WAIT
 # XXX Eventually, we want to be able to build dbsym and mdsetimage
 # XXX if EXTERNAL_TOOLCHAIN is set.
 .endif
 .endif
 
 .if defined(HAVE_PCC)
-TOOLCHAIN_BITS= gmake .WAIT
 .if ${TOOLCHAIN_MISSING} == "no"
-TOOLCHAIN_BITS+= binutils .WAIT
 TOOLCHAIN_BITS+= pcc
 .endif
-TOOLCHAIN_BITS+= .WAIT dbsym mdsetimage
 .endif
 
+TOOLCHAIN_BITS+= dbsym mdsetimage
+
 DTRACE_BITS=
 .if ${MKDTRACE} != "no"
 DTRACE_BITS+= .WAIT libelf