aboutsummaryrefslogtreecommitdiff
path: root/build2/dist
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/dist
parentb1ef30736694f644e2e473429257a18b64a7615c (diff)
Load config.build in init(), not boot()
We now make sure the config module is init'ed first.
Diffstat (limited to 'build2/dist')
-rw-r--r--build2/dist/init.cxx4
-rw-r--r--build2/dist/init.hxx2
2 files changed, 4 insertions, 2 deletions
diff --git a/build2/dist/init.cxx b/build2/dist/init.cxx
index 33ddcd7..818570a 100644
--- a/build2/dist/init.cxx
+++ b/build2/dist/init.cxx
@@ -23,7 +23,7 @@ namespace build2
{
static const rule rule_;
- void
+ bool
boot (scope& rs, const location&, unique_ptr<module_base>& mod)
{
tracer trace ("dist::boot");
@@ -64,6 +64,8 @@ namespace build2
// Create the module.
//
mod.reset (new module (v_d_p));
+
+ return false;
}
bool
diff --git a/build2/dist/init.hxx b/build2/dist/init.hxx
index 45d47df..f1d2bc5 100644
--- a/build2/dist/init.hxx
+++ b/build2/dist/init.hxx
@@ -14,7 +14,7 @@ namespace build2
{
namespace dist
{
- void
+ bool
boot (scope&, const location&, unique_ptr<module_base>&);
bool