summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2001-12-31 23:04:11 +0000
committerthorpej <thorpej@NetBSD.org>2001-12-31 23:04:11 +0000
commit89b1a9ca737abcceaa5da9dec8581eb3d024729a (patch)
tree18fb5f9c7423b12504bb3a1aa261b28ed17f5eb3 /gnu
parent88371dafeb85f6406db90ab2301fb774172ce4c3 (diff)
Introduce 3 new MK* variables that have effect in the USE_NEW_TOOLCHAIN
case: MKBFD If set to "no", disables building of libbfd, libiberty, and all things that depend on them (binutils/gas/ld, gdb, dbsym, mdsetimage). MKGDB If set to "no", disables bulding of gdb. MKGCC If set to "no", disables building of gcc and the gcc-related libraries (libg2c, libgcc, libobjc, libstdc++). These are useful for building platforms for which either of the following situations are true: (1) You have no userland from which to run toolchain2netbsd in order to build the appropriate toolchain build framework. (2) The platform which you are building requires a newer set of tools than are currently in the tree (e.g. x86-64, ia64).
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/Makefile12
-rw-r--r--gnu/usr.bin/binutils/Makefile4
-rw-r--r--gnu/usr.bin/gcc/Makefile4
-rw-r--r--gnu/usr.bin/gdb/gdb.new/Makefile8
-rw-r--r--gnu/usr.sbin/dbsym/Makefile6
-rw-r--r--gnu/usr.sbin/mdsetimage/Makefile6
6 files changed, 28 insertions, 12 deletions
diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile
index 1cf39be1ef3..489496b52ce 100644
--- a/gnu/lib/Makefile
+++ b/gnu/lib/Makefile
@@ -1,10 +1,18 @@
-# $NetBSD: Makefile,v 1.28 2001/12/19 23:54:16 tv Exp $
+# $NetBSD: Makefile,v 1.29 2001/12/31 23:04:12 thorpej Exp $
.include <bsd.own.mk>
.if defined(USE_NEW_TOOLCHAIN)
-SUBDIR+= libbfd libg2c libgcc libiberty libobjc libmalloc libstdc++
+.if ${MKBFD} != "no"
+SUBDIR+= libbfd libiberty
+.endif
+
+.if ${MKGCC} != "no"
+SUBDIR+= libg2c libgcc libobjc libstdc++
+.endif
+
+SUBDIR+= libmalloc
.else
#
diff --git a/gnu/usr.bin/binutils/Makefile b/gnu/usr.bin/binutils/Makefile
index 69af4ee127a..6fff60e1825 100644
--- a/gnu/usr.bin/binutils/Makefile
+++ b/gnu/usr.bin/binutils/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2001/12/19 23:54:20 tv Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/31 23:04:11 thorpej Exp $
.include <bsd.own.mk>
.if defined(USE_NEW_TOOLCHAIN)
+.if ${MKBFD} != "no"
.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 # MKBFD != no
.else
#
diff --git a/gnu/usr.bin/gcc/Makefile b/gnu/usr.bin/gcc/Makefile
index 9a40a68748c..edfdfab8fe0 100644
--- a/gnu/usr.bin/gcc/Makefile
+++ b/gnu/usr.bin/gcc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/12/19 23:54:26 tv Exp $
+# $NetBSD: Makefile,v 1.15 2001/12/31 23:04:12 thorpej Exp $
.include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+.if defined(USE_NEW_TOOLCHAIN) && ${MKGCC} != "no"
SUBDIR+= backend frontend cpp0 gcov .WAIT \
cc1 cc1obj cc1plus cpp f771 g++ g77 gcc protoize unprotoize
diff --git a/gnu/usr.bin/gdb/gdb.new/Makefile b/gnu/usr.bin/gdb/gdb.new/Makefile
index d85582afd99..6c14a164be2 100644
--- a/gnu/usr.bin/gdb/gdb.new/Makefile
+++ b/gnu/usr.bin/gdb/gdb.new/Makefile
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2001/12/19 23:54:32 tv Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/31 23:04:12 thorpej Exp $
# XXX - This gdb.new directory should be renamed to "gdb" after all platforms
# have been migrated to the new toolchain.
+.include <bsd.own.mk>
+
+.if ${MKGDB} != "no" && ${MKBFD} != "no"
+
.include "${.CURDIR}/../arch/${MACHINE_ARCH}/defs.mk"
TOP= ${.CURDIR}/../../..
@@ -23,6 +27,8 @@ TEXINFO= gdb.texinfo gdbint.texinfo stabs.texinfo
INFOFLAGS= -I${DIST}/gdb/doc -I${DIST}/gdb/mi \
-I${DIST}/readline/doc -I${.CURDIR}/..
+.endif # MKGDB != no && MKBFD != no
+
.include "../../Makefile.inc"
.include <bsd.prog.mk>
.include <bsd.info.mk>
diff --git a/gnu/usr.sbin/dbsym/Makefile b/gnu/usr.sbin/dbsym/Makefile
index bf26925b490..51a1de562d4 100644
--- a/gnu/usr.sbin/dbsym/Makefile
+++ b/gnu/usr.sbin/dbsym/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/11/12 23:16:19 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/31 23:04:12 thorpej Exp $
.include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+.if defined(USE_NEW_TOOLCHAIN) && ${MKBFD} != "no"
TOP= ${.CURDIR}/../..
DIST= ${TOP}/dist/toolchain
@@ -28,7 +28,7 @@ CPPFLAGS+= -I${TOP}/lib/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
-.endif # USE_NEW_TOOLCHAIN
+.endif # USE_NEW_TOOLCHAIN && MKBFD != no
.ifndef HOSTPROG
.include <bsd.prog.mk>
diff --git a/gnu/usr.sbin/mdsetimage/Makefile b/gnu/usr.sbin/mdsetimage/Makefile
index a2a73f81230..0d5d7eae887 100644
--- a/gnu/usr.sbin/mdsetimage/Makefile
+++ b/gnu/usr.sbin/mdsetimage/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/11/12 23:16:19 tv Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/31 23:04:13 thorpej Exp $
.include <bsd.own.mk>
-.if defined(USE_NEW_TOOLCHAIN)
+.if defined(USE_NEW_TOOLCHAIN) && ${MKBFD} != "no"
TOP= ${.CURDIR}/../..
DIST= ${TOP}/dist/toolchain
@@ -28,7 +28,7 @@ CPPFLAGS+= -I${TOP}/lib/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
-.endif # USE_NEW_TOOLCHAIN
+.endif # USE_NEW_TOOLCHAIN && MKBFD != no
.ifndef HOSTPROG
.include <bsd.prog.mk>