aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/scope.hxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2021-02-03 09:45:46 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2021-02-03 09:45:46 +0200
commit90d37f3fe126fa7b3d97fb071f537f910bd4a7fa (patch)
tree95d8395498c6d2ba7909e46212414c648647855f /libbuild2/scope.hxx
parent67d799852492743a93a464002395ccb624514fb8 (diff)
Propagate relevant options/prerequisites to header unit sidebuilds
Diffstat (limited to 'libbuild2/scope.hxx')
-rw-r--r--libbuild2/scope.hxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/libbuild2/scope.hxx b/libbuild2/scope.hxx
index bd82853..bc04bae 100644
--- a/libbuild2/scope.hxx
+++ b/libbuild2/scope.hxx
@@ -139,12 +139,20 @@ namespace build2
return lookup (var, &tt, &tn).first;
}
+ lookup_type
+ lookup (const variable& var,
+ const target_type& tt, const string& tn,
+ const target_type& gt, const string& gn) const
+ {
+ return lookup (var, &tt, &tn, &gt, &gn).first;
+ }
+
pair<lookup_type, size_t>
lookup (const variable& var,
- const target_type* tt = nullptr,
- const string* tn = nullptr) const
+ const target_type* tt = nullptr, const string* tn = nullptr,
+ const target_type* gt = nullptr, const string* gn = nullptr) const
{
- auto p (lookup_original (var, tt, tn));
+ auto p (lookup_original (var, tt, tn, gt, gn));
return var.overrides == nullptr ? p : lookup_override (var, move (p));
}