summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2009-12-23 20:15:21 +0000
committermrg <mrg@NetBSD.org>2009-12-23 20:15:21 +0000
commit3fa4bcf59c06bb7c02b28e8af3aa8ce4e32e11f4 (patch)
tree0ea8694a13a700a70379fa73e08ba81a85400faf /tools
parent931d85f0359ff82384d0f3bd383052cf03f579a6 (diff)
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 (limited to 'tools')
-rw-r--r--tools/Makefile27
-rw-r--r--tools/gcc/Makefile3
-rw-r--r--tools/gdb/Makefile3
3 files changed, 17 insertions, 16 deletions
diff --git a/tools/Makefile b/tools/Makefile
index d5134ac9814..8441cfd6a9e 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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 @@ SUBDIR= host-mkdep .WAIT compat .WAIT \
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 --git a/tools/gcc/Makefile b/tools/gcc/Makefile
index e5414377af0..bc2a0031569 100644
--- a/tools/gcc/Makefile
+++ b/tools/gcc/Makefile
@@ -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 @@ MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
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 --git a/tools/gdb/Makefile b/tools/gdb/Makefile
index da16c214f71..f6a8baf5565 100644
--- a/tools/gdb/Makefile
+++ b/tools/gdb/Makefile
@@ -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 @@ CONFIGURE_ARGS_SIM=
${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.'