aboutsummaryrefslogtreecommitdiff
path: root/build2/cli
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-06-26 17:05:07 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-06-26 17:05:07 +0200
commit5f924ea1926fe17acf699a43713b7f5881e9d30d (patch)
treeeccff3428e8a1b689e79b07088fc00b520a9485b /build2/cli
parent61617d7bb990f04970c6357d8e9a9095174d8fc4 (diff)
Add support for passing configuration hints via module init()
Diffstat (limited to 'build2/cli')
-rw-r--r--build2/cli/module9
-rw-r--r--build2/cli/module.cxx5
2 files changed, 11 insertions, 3 deletions
diff --git a/build2/cli/module b/build2/cli/module
index 0469b2c..f55e03c 100644
--- a/build2/cli/module
+++ b/build2/cli/module
@@ -15,8 +15,13 @@ namespace build2
namespace cli
{
extern "C" bool
- cli_init (
- scope&, scope&, const location&, unique_ptr<module_base>&, bool, bool);
+ cli_init (scope&,
+ scope&,
+ const location&,
+ unique_ptr<module_base>&,
+ bool,
+ bool,
+ const variable_map&);
}
}
diff --git a/build2/cli/module.cxx b/build2/cli/module.cxx
index 478c8a8..13325d9 100644
--- a/build2/cli/module.cxx
+++ b/build2/cli/module.cxx
@@ -31,11 +31,14 @@ namespace build2
const location& loc,
unique_ptr<module_base>&,
bool first,
- bool optional)
+ bool optional,
+ const variable_map& config_hints)
{
tracer trace ("cli::init");
l5 ([&]{trace << "for " << base.out_path ();});
+ assert (config_hints.empty ()); // We don't known any hints.
+
// Make sure the cxx module has been loaded since we need its targets
// types (?xx{}). Note that we don't try to load it ourselves because of
// the non-trivial variable merging semantics. So it is better to let