diff --git a/distrib/sets/makeobsolete b/distrib/sets/makeobsolete
index 5cae9893af70..808494fbf19b 100755
--- a/distrib/sets/makeobsolete
+++ b/distrib/sets/makeobsolete
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: makeobsolete,v 1.19 2003/11/25 07:19:46 dyoung Exp $
+# $NetBSD: makeobsolete,v 1.20 2003/12/09 17:57:42 matt Exp $
 #
 # Print out the obsolete files for a set
 # Usage: makeobsolete [-b] [-x] [-a arch] [-m machine] [-s setsdir] \
@@ -96,7 +96,8 @@ for setname in $lists; do
 	if [ -f $setd/lists/$setname/obsolete.${machine} ]; then
 		awk -- '{print $1}' $setd/lists/$setname/obsolete.${machine}
 	fi
-	if [ "$have_gcc3" = yes -a -f $setd/lists/$setname/obsolete.gcc ]; then
+	if [ "$use_tools_toolchain" != yes -a \
+	    -f $setd/lists/$setname/obsolete.gcc ]; then
 		awk -- '{print $1}' $setd/lists/$setname/obsolete.gcc
 	fi
 	) | egrep -v '^#' | sort -ru > $file
diff --git a/distrib/sets/sets.defaults b/distrib/sets/sets.defaults
index 7e6a6b833808..e962a3549542 100755
--- a/distrib/sets/sets.defaults
+++ b/distrib/sets/sets.defaults
@@ -11,7 +11,7 @@ all:
 	@echo machine_cpu=\${MACHINE_CPU}
 	@echo object_fmt=\${OBJECT_FMT}
 	@echo toolchain_missing=\${TOOLCHAIN_MISSING}
-	@echo have_gcc3=\${HAVE_GCC3}
+	@echo use_tools_toolchain=\${USE_TOOLS_TOOLCHAIN}
 .if defined(USE_XF86_4) && (\${USE_XF86_4} != no)
 	@echo x11_version=4
 .else