diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-09 13:33:06 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-09 13:33:06 +0200 |
| commit | 3b0df49b8828921edfb7b764b0628fb164dab852 (patch) | |
| tree | 31796318acfe4a25d90381242f1f4a127f0c9aab /build2/cc/link.cxx | |
| parent | 84fa9cc11a76c41277ab04329e8b37cad08a0f9a (diff) | |
Initial support for prerequisite-specific variables, use for bin.whole
Diffstat (limited to 'build2/cc/link.cxx')
| -rw-r--r-- | build2/cc/link.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx index 4e22151..7f1e8d8 100644 --- a/build2/cc/link.cxx +++ b/build2/cc/link.cxx @@ -814,9 +814,11 @@ namespace build2 // that the variable is not overridable so we omit find_override() // calls. // - //@@ TODO: prerequisite-specific lookup. - // - lookup l (pt->find_original (var, true).first); + lookup l (p.prerequisite.vars[var]); + + if (!l.defined ()) + l = pt->find_original (var, true).first; + if (!l.defined ()) { bool g (pt->group != nullptr); |