aboutsummaryrefslogtreecommitdiff
path: root/build2/config/init.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-02-01 16:36:24 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-02-13 12:42:41 +0200
commite3e597180487328a54721e2afb95e33ed853d586 (patch)
tree89d59f482d41eb37a90f97b0dd55c2e878e4800b /build2/config/init.cxx
parent1dd17210b76d544a04fc6b4f3c98162ae9718102 (diff)
Pass const scope& where modification should not happen
Diffstat (limited to 'build2/config/init.cxx')
-rw-r--r--build2/config/init.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/build2/config/init.cxx b/build2/config/init.cxx
index a73c394..682d817 100644
--- a/build2/config/init.cxx
+++ b/build2/config/init.cxx
@@ -75,7 +75,7 @@ namespace build2
{
// Assume missing version is 0.
//
- auto p (extract_variable (f, c_v));
+ auto p (extract_variable (rs, f, c_v));
uint64_t v (p.second ? cast<uint64_t> (p.first) : 0);
if (v != module::version)
@@ -127,9 +127,10 @@ namespace build2
//
{
// We need this rule for out-of-any-project dependencies (e.g.,
- // libraries imported from /usr/lib).
+ // libraries imported from /usr/lib). Registring it on the global
+ // scope smells a bit but seems harmless.
//
- global_scope->rules.insert<file> (
+ rs.global ().rules.insert<file> (
configure_id, 0, "config.file", file_rule::instance);
auto& r (rs.rules);