Thu Sep 20 15:50:20 2012 UTC ()
fix EXTERNAL_TOOLCHAIN build


(pooka)
diff -r1.156 -r1.157 src/tools/Makefile
cvs diff -r1.156 -r1.157 src/tools/Makefile (expand / switch to unified diff)

--- src/tools/Makefile 2012/08/10 16:13:36 1.156
+++ src/tools/Makefile 2012/09/20 15:50:20 1.157
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.156 2012/08/10 16:13:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.157 2012/09/20 15:50:20 pooka Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.if defined(HAVE_GCC) || defined(HAVE_PCC) 5.if defined(HAVE_GCC) || defined(HAVE_PCC)
6TOOLCHAIN_BITS= gmake .WAIT 6TOOLCHAIN_BITS= gmake .WAIT
7.endif 7.endif
8 8
9.if ${TOOLCHAIN_MISSING} == "no" 9.if ${TOOLCHAIN_MISSING} == "no"
10.if defined(HAVE_GCC) 10.if defined(HAVE_GCC)
11.if ${HAVE_GCC} >= 45 11.if ${HAVE_GCC} >= 45
12TOOLCHAIN_BITS+= gmp .WAIT 12TOOLCHAIN_BITS+= gmp .WAIT
13TOOLCHAIN_BITS+= mpfr .WAIT 13TOOLCHAIN_BITS+= mpfr .WAIT
14TOOLCHAIN_BITS+= mpc .WAIT 14TOOLCHAIN_BITS+= mpc .WAIT
@@ -17,38 +17,40 @@ TOOLCHAIN_BITS+= mpc .WAIT @@ -17,38 +17,40 @@ TOOLCHAIN_BITS+= mpc .WAIT
17.endif 17.endif
18 18
19.if ${TOOLCHAIN_MISSING} == "no" 19.if ${TOOLCHAIN_MISSING} == "no"
20TOOLCHAIN_BITS+= binutils .WAIT 20TOOLCHAIN_BITS+= binutils .WAIT
21.endif 21.endif
22 22
23.if defined(HAVE_GCC) 23.if defined(HAVE_GCC)
24.if ${TOOLCHAIN_MISSING} == "no" 24.if ${TOOLCHAIN_MISSING} == "no"
25TOOLCHAIN_BITS+= gcc 25TOOLCHAIN_BITS+= gcc
26. if ${MKCROSSGDB:Uno} != "no" 26. if ${MKCROSSGDB:Uno} != "no"
27TOOLCHAIN_BITS+= gdb 27TOOLCHAIN_BITS+= gdb
28. endif 28. endif
29TOOLCHAIN_BITS+= .WAIT 29TOOLCHAIN_BITS+= .WAIT
30# XXX Eventually, we want to be able to build dbsym and mdsetimage 
31# XXX if EXTERNAL_TOOLCHAIN is set. 
32.endif 30.endif
33.endif 31.endif
34 32
35.if defined(HAVE_PCC) 33.if defined(HAVE_PCC)
36.if ${TOOLCHAIN_MISSING} == "no" 34.if ${TOOLCHAIN_MISSING} == "no"
37TOOLCHAIN_BITS+= pcc 35TOOLCHAIN_BITS+= pcc
38.endif 36.endif
39.endif 37.endif
40 38
 39.if ${TOOLCHAIN_MISSING} == "no"
 40# XXX Eventually, we want to be able to build dbsym and mdsetimage
 41# XXX if EXTERNAL_TOOLCHAIN is set.
41TOOLCHAIN_BITS+= dbsym mdsetimage 42TOOLCHAIN_BITS+= dbsym mdsetimage
 43.endif
42 44
43DTRACE_BITS= 45DTRACE_BITS=
44.if ${MKDTRACE} != "no" 46.if ${MKDTRACE} != "no"
45DTRACE_BITS+= .WAIT libelf 47DTRACE_BITS+= .WAIT libelf
46DTRACE_BITS+= .WAIT libdwarf 48DTRACE_BITS+= .WAIT libdwarf
47DTRACE_BITS+= .WAIT libctf  49DTRACE_BITS+= .WAIT libctf
48DTRACE_BITS+= .WAIT ctfconvert ctfmerge 50DTRACE_BITS+= .WAIT ctfconvert ctfmerge
49.endif 51.endif
50 52
51LINT_BITS= 53LINT_BITS=
52.if ${MKLINT} != "no" 54.if ${MKLINT} != "no"
53LINT_BITS= lint lint2 55LINT_BITS= lint lint2
54.endif 56.endif