Module Name: src
Committed By: dyoung
Date: Tue Nov 3 00:38:56 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Always respect MKBINUTILS=no, MKGCC=no, and MKGDB=no by filtering
entries binutils=N, gcc=N, or gdb=N from the set list.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/distrib/sets/sets.subr
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.89 src/distrib/sets/sets.subr:1.90
--- src/distrib/sets/sets.subr:1.89 Wed Oct 7 22:22:18 2009
+++ src/distrib/sets/sets.subr Tue Nov 3 00:38:56 2009
@@ -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
