Module Name: src
Committed By: joerg
Date: Fri Aug 10 16:13:36 UTC 2012
Modified Files:
src/tools: Makefile
Log Message:
Decouple binutils build from HAVE_GCC. Merge common fragments of
HAVE_GCC and HAVE_PCC.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/tools/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/Makefile
diff -u src/tools/Makefile:1.155 src/tools/Makefile:1.156
--- src/tools/Makefile:1.155 Thu Nov 3 07:42:56 2011
+++ src/tools/Makefile Fri Aug 10 16:13:36 2012
@@ -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
