diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-09 11:06:02 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-07-09 11:06:02 +0200 |
| commit | e9f64680a152c5aafd023bb5691447012e222590 (patch) | |
| tree | b36068799bd50c74eee87f298c685d223c84f363 /libbuild2/install | |
| parent | d084b50790dcbf675f2d5f451c986b3128216980 (diff) | |
Relax prerequisite filtering semantics of aliases in test and install rules
Diffstat (limited to 'libbuild2/install')
| -rw-r--r-- | libbuild2/install/rule.cxx | 3 | ||||
| -rw-r--r-- | libbuild2/install/rule.hxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libbuild2/install/rule.cxx b/libbuild2/install/rule.cxx index 901b048..d7b0fc0 100644 --- a/libbuild2/install/rule.cxx +++ b/libbuild2/install/rule.cxx @@ -63,8 +63,7 @@ namespace build2 const target* alias_rule:: filter (action, const target& t, const prerequisite& p) const { - const target& pt (search (t, p)); - return pt.in (t.weak_scope ()) ? &pt : nullptr; + return &search (t, p); } recipe alias_rule:: diff --git a/libbuild2/install/rule.hxx b/libbuild2/install/rule.hxx index 5896589..916fc6d 100644 --- a/libbuild2/install/rule.hxx +++ b/libbuild2/install/rule.hxx @@ -25,8 +25,7 @@ namespace build2 match (action, target&, const string&) const override; // Return NULL if this prerequisite should be ignored and pointer to its - // target otherwise. The default implementation accepts all prerequsites - // from the target's (weak) amalgamation. + // target otherwise. The default implementation allows all prerequsites. // // The prerequisite is passed as an iterator allowing the filter to // "see" inside groups. |