[src/trunk]: src/tools rework the main SUBDIR list here as suggested by enami...

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

details:   https://anonhg.NetBSD.org/src/rev/f84334174215
branches:  trunk
changeset: 750308:f84334174215
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Dec 23 20:15:21 2009 +0000

description:
rework the main SUBDIR list here as suggested by enami.  put .WAIT on
the same line as the target that needs to wait, but before the target,
rather than on the previous line, which led to confusion and an error
being introduced in the previous change.

diffstat:

 tools/Makefile     |  27 +++++++++++++--------------
 tools/gcc/Makefile |   3 ++-
 tools/gdb/Makefile |   3 ++-
 3 files changed, 17 insertions(+), 16 deletions(-)

diffs (78 lines):

diff -r ab4e8a65cdba -r f84334174215 tools/Makefile
--- a/tools/Makefile    Wed Dec 23 19:38:33 2009 +0000
+++ b/tools/Makefile    Wed Dec 23 20:15:21 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.131 2009/12/21 20:57:36 mrg Exp $
+#      $NetBSD: Makefile,v 1.132 2009/12/23 20:15:21 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -37,22 +37,21 @@
        binstall .WAIT mktemp .WAIT sed .WAIT \
                cap_mkdb crunchgen ctags genassym gencat hexdump join \
                ${LINT_BITS} \
-               lorder makewhatis mkdep mtree rpcgen tsort uudecode \
-       m4 .WAIT \
-       texinfo .WAIT \
-       yacc .WAIT \
-       awk .WAIT \
-       lex .WAIT \
-       pax .WAIT \
-       libelf .WAIT \
-       ${TOOLCHAIN_BITS} \
+               lorder makewhatis mkdep mtree rpcgen tsort uudecode m4 \
+       .WAIT texinfo \
+       .WAIT yacc \
+       .WAIT awk \
+       .WAIT lex \
+       .WAIT pax \
+       .WAIT libelf \
+       .WAIT ${TOOLCHAIN_BITS} \
                asn1_compile atf-compile cat cksum compile_et config db \
                file lint1 \
                makefs menuc mkcsmapper mkesdb mklocale mknod msgc \
-               disklabel .WAIT \
-               paxctl .WAIT \
-               fdisk .WAIT \
-               installboot .WAIT \
+               .WAIT disklabel \
+               .WAIT paxctl \
+               .WAIT fdisk \
+               .WAIT installboot \
                pwd_mkdb stat strfile sunlabel zic
 
 .if ${MKMAN} != "no" || ${MKDOC} != "no" || ${MKHTML} != "no"
diff -r ab4e8a65cdba -r f84334174215 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Wed Dec 23 19:38:33 2009 +0000
+++ b/tools/gcc/Makefile        Wed Dec 23 20:15:21 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.32 2009/05/04 21:32:31 ad Exp $
+#      $NetBSD: Makefile,v 1.33 2009/12/23 20:15:21 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -42,6 +42,7 @@
 CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes
 
 MKNATIVE_ENV=  ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
+                       BOOTSTRAP_CFLAGS=-O2 \
                        CC_FOR_BUILD=${HOST_CC:Q} \
                        CC=${CC:Q}' '${CCADDFLAGS:Q} \
                        CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
diff -r ab4e8a65cdba -r f84334174215 tools/gdb/Makefile
--- a/tools/gdb/Makefile        Wed Dec 23 19:38:33 2009 +0000
+++ b/tools/gdb/Makefile        Wed Dec 23 20:15:21 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2009/12/15 11:39:05 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.15 2009/12/23 20:15:21 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -42,6 +42,7 @@
     ${MACHINE_CPU} != "powerpc64"
 CONFIGURE_ARGS_SIM+= --disable-sim
 .endif
+CONFIGURE_ARGS_SIM+= --disable-sim
 
 native-gdb: .native/.configure_done
        @echo 'Extracting GDB configury for a native toolchain.'