Module Name: src
Committed By: mrg
Date: Wed Dec 23 20:15:21 UTC 2009
Modified Files:
src/tools: Makefile
src/tools/gcc: Makefile
src/tools/gdb: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/tools/Makefile
cvs rdiff -u -r1.32 -r1.33 src/tools/gcc/Makefile
cvs rdiff -u -r1.14 -r1.15 src/tools/gdb/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.131 src/tools/Makefile:1.132
--- src/tools/Makefile:1.131 Mon Dec 21 20:57:36 2009
+++ src/tools/Makefile Wed Dec 23 20:15:21 2009
@@ -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"
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.32 src/tools/gcc/Makefile:1.33
--- src/tools/gcc/Makefile:1.32 Mon May 4 21:32:31 2009
+++ src/tools/gcc/Makefile Wed Dec 23 20:15:21 2009
@@ -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} \
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.14 src/tools/gdb/Makefile:1.15
--- src/tools/gdb/Makefile:1.14 Tue Dec 15 11:39:05 2009
+++ src/tools/gdb/Makefile Wed Dec 23 20:15:21 2009
@@ -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.'
