[src/trunk]: src/distrib/sets Always respect MKBINUTILS=no, MKGCC=no, and MKG...

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

details:   https://anonhg.NetBSD.org/src/rev/cc3766d83724
branches:  trunk
changeset: 748717:cc3766d83724
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Tue Nov 03 00:38:56 2009 +0000

description:
Always respect MKBINUTILS=no, MKGCC=no, and MKGDB=no by filtering
entries binutils=N, gcc=N, or gdb=N from the set list.

diffstat:

 distrib/sets/sets.subr |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (34 lines):

diff -r 59fc05ac869d -r cc3766d83724 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Tue Nov 03 00:30:31 2009 +0000
+++ b/distrib/sets/sets.subr    Tue Nov 03 00:38:56 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: sets.subr,v 1.89 2009/10/07 22:22:18 haad Exp $
+#      $NetBSD: sets.subr,v 1.90 2009/11/03 00:38:56 dyoung Exp $
 #
 
 #
@@ -237,7 +237,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-#      # $NetBSD: sets.subr,v 1.89 2009/10/07 22:22:18 haad Exp $
+#      # $NetBSD: sets.subr,v 1.90 2009/11/03 00:38:56 dyoung Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -347,9 +347,12 @@
                        }
 
                        if ("'"${TOOLCHAIN_MISSING}"'" != "yes") {
-                               wanted["binutils=" "'"${HAVE_BINUTILS}"'"] = 1
-                               wanted["gcc=" "'"${HAVE_GCC}"'"] = 1
-                               wanted["gdb=" "'"${HAVE_GDB}"'"] = 1
+                               if ("binutils" in wanted)
+                                       wanted["binutils=" "'"${HAVE_BINUTILS}"'"] = 1
+                               if ("gcc" in wanted)
+                                       wanted["gcc=" "'"${HAVE_GCC}"'"] = 1
+                               if ("gdb" in wanted)
+                                       wanted["gdb=" "'"${HAVE_GDB}"'"] = 1
                        }
                        if (("man" in wanted) && ("catpages" in wanted))
                                wanted[".cat"] = 1