aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/version/rule.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-10-15 14:20:44 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-10-15 14:20:44 +0200
commit921c2d503a63f4769fdf1c7e6eb31be2706f9bea (patch)
tree487698c7e2877dec1eed4945cd2d1e9e09b7eb66 /libbuild2/version/rule.cxx
parent291a737de8f92a7f620853133aa404b98e552a21 (diff)
Add ability to specify fallback value for NULL substitutions with in.null
Diffstat (limited to 'libbuild2/version/rule.cxx')
-rw-r--r--libbuild2/version/rule.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/libbuild2/version/rule.cxx b/libbuild2/version/rule.cxx
index 6fd97ae..919dfcf 100644
--- a/libbuild2/version/rule.cxx
+++ b/libbuild2/version/rule.cxx
@@ -88,7 +88,8 @@ namespace build2
lookup (const location& l,
action a,
const target& t,
- const string& n) const
+ const string& n,
+ const optional<string>& null) const
{
// Note that this code will be executed during up-to-date check for each
// substitution so let's try not to do anything overly sub-optimal here.
@@ -108,7 +109,8 @@ namespace build2
return rule::lookup (l, // Standard lookup.
a,
t,
- p == string::npos ? n : string (n, p + 1));
+ p == string::npos ? n : string (n, p + 1),
+ null);
}
string pn (n, 0, p);