From 29f8159583d2b02efa2afeaa58082f57222c943d Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 3 Dec 2015 14:37:22 +0200 Subject: Add ability for module to remember that it is unconfigured A module can set and then check the config.*.configured special variable to false. --- build/config/utility.cxx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'build/config/utility.cxx') diff --git a/build/config/utility.cxx b/build/config/utility.cxx index c9d7c66..b81cb04 100644 --- a/build/config/utility.cxx +++ b/build/config/utility.cxx @@ -60,9 +60,18 @@ namespace build // for (scope* s (&r); s != nullptr; s = s->parent_scope ()) { - auto p (s->vars.find_namespace (ns)); - if (p.first != p.second) - return true; + for (auto p (s->vars.find_namespace (ns)); + p.first != p.second; + ++p.first) + { + const variable& var (p.first->first); + + // Ignore config.*.configured. + // + if (var.name.size () < 11 || + var.name.compare (var.name.size () - 11, 11, ".configured") != 0) + return true; + } } return false; -- cgit v1.1