diff options
| author | thorpej <thorpej@NetBSD.org> | 2001-12-15 03:37:36 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2001-12-15 03:37:36 +0000 |
| commit | 3faae759ba5cf9768a481c67679bdac4e65df063 (patch) | |
| tree | 4f9d6a9d187365a6999e4a684a9e782395de8fb2 /gnu | |
| parent | 9b744bba67b5663e3c3fd9ebb7f95d35973311be (diff) | |
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 (limited to 'gnu')
| -rw-r--r-- | gnu/lib/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/binutils/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/gcc/Makefile | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/gdb/gdb.new/Makefile | 7 |
4 files changed, 14 insertions, 5 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index b8cb4aa7a33..cac2756aab8 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -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 --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile index 540d9b1ce42..ef2e3f4d9d0 100644 --- a/gnu/usr.bin/binutils/Makefile +++ b/gnu/usr.bin/binutils/Makefile @@ -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 --git a/gnu/usr.bin/gcc/Makefile b/gnu/usr.bin/gcc/Makefile index cbe19d438d6..39116a830e0 100644 --- a/gnu/usr.bin/gcc/Makefile +++ b/gnu/usr.bin/gcc/Makefile @@ -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 --git a/gnu/usr.bin/gdb/gdb.new/Makefile b/gnu/usr.bin/gdb/gdb.new/Makefile index 56ec1a65451..e0b6868387e 100644 --- a/gnu/usr.bin/gdb/gdb.new/Makefile +++ b/gnu/usr.bin/gdb/gdb.new/Makefile @@ -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 @@ TEXINFO= gdb.texinfo gdbint.texinfo stabs.texinfo 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> |
