[src/trunk]: src/gnu Allow a new-toolchain build to be done without actually ...

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

details:   https://anonhg.NetBSD.org/src/rev/2381d55fc218
branches:  trunk
changeset: 519325:2381d55fc218
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Dec 15 03:37:36 2001 +0000

description:
Allow a new-toolchain build to be done without actually building
the target "native toolchain" if BOOTSTRAP_NEW_TOOLCHAIN is set.

This is important if you don't have any userland at all, and you're
trying to make one from which you can run toolchain2netbsd.

diffstat:

 gnu/lib/Makefile                 |  4 +++-
 gnu/usr.bin/binutils/Makefile    |  4 +++-
 gnu/usr.bin/gcc/Makefile         |  4 ++--
 gnu/usr.bin/gdb/gdb.new/Makefile |  7 ++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diffs (82 lines):

diff -r c95db09c381a -r 2381d55fc218 gnu/lib/Makefile
--- a/gnu/lib/Makefile  Sat Dec 15 03:23:39 2001 +0000
+++ b/gnu/lib/Makefile  Sat Dec 15 03:37:36 2001 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.26 2001/08/09 16:09:52 mrg Exp $
+#      $NetBSD: Makefile,v 1.27 2001/12/15 03:37:36 thorpej Exp $
 
 .include <bsd.own.mk>
 
 .if defined(USE_NEW_TOOLCHAIN)
 
+.if !defined(BOOTSTRAP_NEW_TOOLCHAIN)
 SUBDIR+= libbfd libg2c libgcc libiberty libobjc libmalloc libstdc++
+.endif
 
 .else
 #
diff -r c95db09c381a -r 2381d55fc218 gnu/usr.bin/binutils/Makefile
--- a/gnu/usr.bin/binutils/Makefile     Sat Dec 15 03:23:39 2001 +0000
+++ b/gnu/usr.bin/binutils/Makefile     Sat Dec 15 03:37:36 2001 +0000
@@ -1,13 +1,15 @@
-#      $NetBSD: Makefile,v 1.14 2001/08/06 19:59:39 tv Exp $
+#      $NetBSD: Makefile,v 1.15 2001/12/15 03:37:37 thorpej Exp $
 
 .include <bsd.own.mk>
 
 .if defined(USE_NEW_TOOLCHAIN)
 
+.if !defined(BOOTSTRAP_NEW_TOOLCHAIN)
 .include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
 
 SUBDIR=                common gas gprof ld ${G_PROGRAMS:C/-new$//:cxxfilt=c++filt}
 SUBDIR:=       ${SUBDIR:O} # alphabetize
+.endif
 
 .else
 #
diff -r c95db09c381a -r 2381d55fc218 gnu/usr.bin/gcc/Makefile
--- a/gnu/usr.bin/gcc/Makefile  Sat Dec 15 03:23:39 2001 +0000
+++ b/gnu/usr.bin/gcc/Makefile  Sat Dec 15 03:37:36 2001 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.12 2001/12/12 01:49:01 tv Exp $
+#      $NetBSD: Makefile,v 1.13 2001/12/15 03:37:37 thorpej Exp $
 
 .include <bsd.own.mk>
 
-.ifdef USE_NEW_TOOLCHAIN
+.if defined(USE_NEW_TOOLCHAIN) && !defined(BOOTSTRAP_NEW_TOOLCHAIN)
 
 SUBDIR+=       backend frontend cpp0 gcov .WAIT \
                cc1 cc1obj cc1plus f771 cpp g++ g77 gcc
diff -r c95db09c381a -r 2381d55fc218 gnu/usr.bin/gdb/gdb.new/Makefile
--- a/gnu/usr.bin/gdb/gdb.new/Makefile  Sat Dec 15 03:23:39 2001 +0000
+++ b/gnu/usr.bin/gdb/gdb.new/Makefile  Sat Dec 15 03:37:36 2001 +0000
@@ -1,14 +1,17 @@
-#      $NetBSD: Makefile,v 1.2 2001/08/16 16:59:24 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2001/12/15 03:37:37 thorpej Exp $
 
 # XXX - This gdb.new directory should be renamed to "gdb" after all platforms
 # have been migrated to the new toolchain.
 
+.if !defined(BOOTSTRAP_NEW_TOOLCHAIN)
+
 .include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
 
 TOP=           ${.CURDIR}/../../..
 DIST=          ${TOP}/dist/toolchain
 
 PROG=          gdb
+COPTS+=-g
 
 SRCS=          ${G_LIBGDB_OBS:.o=.c} ${G_OBJECTS:Nxmalloc.o:.o=.c} main.c
 CPPFLAGS=      -I${.CURDIR}/../arch/${MACHINE_ARCH} \
@@ -23,6 +26,8 @@
 INFOFLAGS=     -I${DIST}/gdb/doc -I${DIST}/gdb/mi \
                -I${DIST}/readline/doc -I${.CURDIR}/..
 
+.endif
+
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
 .include <bsd.info.mk>