diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-09-08 16:16:11 +0200 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-09-11 13:57:29 +0300 |
| commit | ffa0839de796fbefc48bacc4777648ff19b3fee6 (patch) | |
| tree | 0f493314df633b6f35f9b9db78c7163506c8eed1 /build2/version | |
| parent | 66e516ad81225b888469b24e726095533c4f9c4c (diff) | |
Add ability to pass scope to buildfile functions, add $install.resolve()
Diffstat (limited to 'build2/version')
| -rw-r--r-- | build2/version/rule.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/version/rule.cxx b/build2/version/rule.cxx index a9d62ba..ceeb003 100644 --- a/build2/version/rule.cxx +++ b/build2/version/rule.cxx @@ -281,7 +281,7 @@ namespace build2 // Perform substitutions for the project itself (normally the version.* // variables but we allow anything set on the root scope). // - auto subst_self = [&rs] (const location& l, const string& s) + auto subst_self = [&rs, &t] (const location& l, const string& s) { if (lookup x = rs.vars[s]) { @@ -291,7 +291,7 @@ namespace build2 return convert<string> ( functions.call ( - "string", vector_view<value> (&v, 1), l)); + t.base_scope (), "string", vector_view<value> (&v, 1), l)); } else fail (l) << "undefined project variable '" << s << "'" << endf; |