[src/trunk]: src/distrib/sets Pass the correct ${MKVARS} equivalent value to ...

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

details:   https://anonhg.NetBSD.org/src/rev/f2f03e68d797
branches:  trunk
changeset: 749562:f2f03e68d797
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Wed Dec 02 15:05:55 2009 +0000

description:
Pass the correct ${MKVARS} equivalent value to list_set_files().

XXX list_set_files() needs to be rewritten.

diffstat:

 distrib/sets/sets.subr |  17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 169b21b9d58e -r f2f03e68d797 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Wed Dec 02 14:32:15 2009 +0000
+++ b/distrib/sets/sets.subr    Wed Dec 02 15:05:55 2009 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: sets.subr,v 1.96 2009/12/02 14:32:15 uebayasi Exp $
+#      $NetBSD: sets.subr,v 1.97 2009/12/02 15:05:55 uebayasi Exp $
 #
 
+set -vx
+
 #
 # The following variables contain defaults for sets.subr functions and callers:
 #      setsdir                 path to src/distrib/sets
@@ -124,6 +126,15 @@
 oIFS=$IFS
 IFS="
 "
+for i in _MKVARS.yes _MKVARS.no; do
+       eval $(
+${MAKE} -B -f- all <<EOMAKE
+.include <bsd.own.mk>
+all:
+       @echo "export _MKVARS_${i#*.}=\"\${$i}\""
+EOMAKE
+)
+done
 for x in $(
 ${MAKE} -B -f- all <<EOMAKE
 .include <bsd.own.mk>
@@ -197,7 +208,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.96 2009/12/02 14:32:15 uebayasi Exp $
+#      # $NetBSD: sets.subr,v 1.97 2009/12/02 15:05:55 uebayasi Exp $
 #      .                       base-sys-root   [keyword[,...]]
 #      ./altroot               base-sys-root
 #      ./bin                   base-sys-root
@@ -298,7 +309,7 @@
                        if (obsolete)
                                wanted["obsolete"] = 1
                
-                       split("'"${MKVARS}"'", needvars)
+                       split("'"${MKEXTRAVARS} ${_MKVARS_yes} ${_MKVARS_no}"'", needvars)
                        for (vi in needvars) {
                                nv = needvars[vi]
                                kw = tolower(nv)