aboutsummaryrefslogtreecommitdiff
path: root/build2/version
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-01-04 16:04:39 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-01-04 16:04:39 +0200
commit759e714238438cccf74f035e1ba11c925b27cd55 (patch)
tree36683f9df793d0100f49189dad9cabf09be78d89 /build2/version
parentb1ef30736694f644e2e473429257a18b64a7615c (diff)
Load config.build in init(), not boot()
We now make sure the config module is init'ed first.
Diffstat (limited to 'build2/version')
-rw-r--r--build2/version/init.cxx4
-rw-r--r--build2/version/init.hxx2
2 files changed, 4 insertions, 2 deletions
diff --git a/build2/version/init.cxx b/build2/version/init.cxx
index 69d7401..63e32ab 100644
--- a/build2/version/init.cxx
+++ b/build2/version/init.cxx
@@ -30,7 +30,7 @@ namespace build2
static const version_doc version_doc_;
static const version_in version_in_;
- void
+ bool
boot (scope& rs, const location& l, unique_ptr<module_base>& mod)
{
tracer trace ("version::boot");
@@ -225,6 +225,8 @@ namespace build2
// Create the module.
//
mod.reset (new module (move (v), move (ds)));
+
+ return true; // Init first (dist.package, etc).
}
static void
diff --git a/build2/version/init.hxx b/build2/version/init.hxx
index 54beae1..425e282 100644
--- a/build2/version/init.hxx
+++ b/build2/version/init.hxx
@@ -14,7 +14,7 @@ namespace build2
{
namespace version
{
- void
+ bool
boot (scope&, const location&, unique_ptr<module_base>&);
bool