From 6289ed7a3e0f3e5cff472ed7d6cac3ac94341b7a Mon Sep 17 00:00:00 2001
From: jmc <jmc@NetBSD.org>
Date: Sat, 20 Oct 2001 06:11:21 +0000
Subject: [PATCH] Change sets so the differing toolchain bits only (not the
 complete toolchain at the moment) are pulled out into tc.mi and tc.old files.

tc.mi has any files which are in the new toolchain only and tc.old contains
the reverse (files which only existed in the old toolchain). The remainder
of the toolchain that is common between both old and new is still contained
in the various mi/md files.

Check for USE_NEW_TOOLCHAIN=yes in makeflist to determine which tc files to
pull in if they exist.

XXX - All the toolchain bits should eventually be pulled out into separate
lists as tc.mi and tc.<arch>. Leaving it for now until the new toolchain is
fully integrated on all ports.
---
 distrib/sets/README    | 11 ++++++++++-
 distrib/sets/makeflist | 12 +++++++++++-
 share/mk/bsd.own.mk    |  8 ++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/distrib/sets/README b/distrib/sets/README
index 25935ba91899..9c991db77fac 100644
--- a/distrib/sets/README
+++ b/distrib/sets/README
@@ -1,4 +1,4 @@
-# $NetBSD: README,v 1.4 2000/06/20 06:00:28 thorpej Exp $
+# $NetBSD: README,v 1.5 2001/10/20 06:11:21 jmc Exp $
 
 To: "NetBSD Port Maintainers"
 Subject: distribution sets, etc...
@@ -42,6 +42,15 @@ and 'misc' sets, but that's explained later.)
 There is one machine-independent file, named "mi".  There are
 N machine-dependent files (one per architecture), named "md.${ARCH}".
 
+XXX - Temporarily (while USE_NEW_TOOLCHAIN is in effect) there are also tc.mi
+and tc.old files in some of the set lists. tc.mi lists files in the new 
+toolchain that didn't exist in the old toolchain. tc.old lists files removed
+and aren't present in the new toolchain. All other toolchain information was
+left for now in the various mi/md files. The makeflist script will check
+for USE_NEW_TOOLCHAIN and pull the appropriate one into place. Once all
+ports are converted to the new toolchain the entire toolchain should be pulled
+into tc.mi and/or tc.${MACHINE} and everything in tc.old moved to obsolete.
+
 the sets are as follows:
 
 	base:	the base binary set.  excludes everything described
diff --git a/distrib/sets/makeflist b/distrib/sets/makeflist
index 460c815033b0..aa46345714b5 100755
--- a/distrib/sets/makeflist
+++ b/distrib/sets/makeflist
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeflist,v 1.35 2001/09/08 11:09:26 thomas Exp $
+# $NetBSD: makeflist,v 1.36 2001/10/20 06:11:21 jmc Exp $
 #
 # Print out the files in some or all lists.
 # Usage: makeflist [-b] [-x] [-a arch] [-m machine] [-s setsdir] [setname ...]
@@ -10,6 +10,7 @@
 : ${MAKE=make}
 machine=${MACHINE:-`printf 'xxx:\n\techo ${MACHINE}' | $MAKE -s -f-`}
 arch=${MACHINE_ARCH:-`printf 'xxx:\n\techo ${MACHINE_ARCH}' | $MAKE -s -f-`}
+tc=${USE_NEW_TOOLCHAIN:-`printf '.include <bsd.own.mk>\nxxx:\n\techo ${USE_NEW_TOOLCHAIN}' | /usr/bin/make -m /usr/src/share/mk -s -f-`}
 setd=`pwd`
 nlists="base comp etc games man misc text"
 xlists="xbase xcomp xcontrib xfont xserver xmisc"
@@ -96,4 +97,13 @@ for setname in $lists; do
 			cat $setd/lists/$setname/lint.mi
 		fi
 	fi
+	if [ "$tc" = "yes" ]; then
+		if [ -f $setd/lists/$setname/tc.mi ]; then
+			cat $setd/lists/$setname/tc.mi
+		fi
+	else
+		if [ -f $setd/lists/$setname/tc.old ]; then
+			cat $setd/lists/$setname/tc.old
+		fi
+	fi
 done | egrep -v '^#' | awk -- '{print $1}' | sort -u
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index f22313b935a0..1b8643209b95 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.188 2001/10/20 06:05:00 jmc Exp $
+#	$NetBSD: bsd.own.mk,v 1.189 2001/10/20 06:11:21 jmc Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -10,9 +10,13 @@ MAKECONF?=	/etc/mk.conf
 .endif
 
 # Temporary; this will become default when all platforms have migrated.
+.if defined(USE_NEW_TOOLCHAIN) && ${USE_NEW_TOOLCHAIN} == "no"
+.undef USE_NEW_TOOLCHAIN	# unset
+.else
 .if ${MACHINE_ARCH} == "i386" || \
     ${MACHINE_ARCH} == "sparc64"
-USE_NEW_TOOLCHAIN=	# set
+USE_NEW_TOOLCHAIN=yes	# set
+.endif
 .endif
 
 .if defined(BSD_PKG_MK) || !defined(USE_NEW_TOOLCHAIN)