diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-09-02 10:29:15 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-09-02 10:29:15 +0200 |
| commit | 8ecc09653d70fe8df4fc9fcd7214ba85e6db9c9c (patch) | |
| tree | 7c5a8bbe8899faa10100dcf8b09b1e66f7d2900d /libbuild2/bash | |
| parent | ce69ad7c2aaf517ec3f789300bf1ae29d8f0dc5d (diff) | |
Add ability to specify `in` rule substitution as key-value pairs
Diffstat (limited to 'libbuild2/bash')
| -rw-r--r-- | libbuild2/bash/rule.cxx | 3 | ||||
| -rw-r--r-- | libbuild2/bash/rule.hxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libbuild2/bash/rule.cxx b/libbuild2/bash/rule.cxx index 2abddc3..6e287e0 100644 --- a/libbuild2/bash/rule.cxx +++ b/libbuild2/bash/rule.cxx @@ -214,13 +214,14 @@ namespace build2 const string& n, optional<uint64_t> flags, bool strict, + const substitution_map* smap, const optional<string>& null) const { assert (!flags); return n.compare (0, 6, "import") == 0 && (n[6] == ' ' || n[6] == '\t') ? substitute_import (l, a, t, trim (string (n, 7))) - : rule::substitute (l, a, t, n, nullopt, strict, null); + : rule::substitute (l, a, t, n, nullopt, strict, smap, null); } string in_rule:: diff --git a/libbuild2/bash/rule.hxx b/libbuild2/bash/rule.hxx index f7ce5cd..5bd7fa7 100644 --- a/libbuild2/bash/rule.hxx +++ b/libbuild2/bash/rule.hxx @@ -52,6 +52,7 @@ namespace build2 const string&, optional<uint64_t>, bool, + const substitution_map*, const optional<string>&) const override; string |