diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-19 09:24:38 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-19 15:25:50 +0200 |
| commit | fc18a6dc1fcb02b505f07914e484cebbaf268698 (patch) | |
| tree | 2cb9b04c5924dfd46e7d934912b41c3efd894a93 /build2/algorithm.cxx | |
| parent | ae20570f2ad55b2fa8e71cf450457cb9c4b21b1b (diff) | |
Redesign src/out scoping
We no longer enter paths from the src tree into scope map. Instead, targets
from the src tree now include their out tree directory (in essence their
"configuration"). This is then used to find a target's scope. See the
comment in class target for details.
The result of this change is that we can now again build multiple
configurations (out trees) for same project at once.
Diffstat (limited to 'build2/algorithm.cxx')
| -rw-r--r-- | build2/algorithm.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx index 80325ed..ce25acf 100644 --- a/build2/algorithm.cxx +++ b/build2/algorithm.cxx @@ -44,7 +44,10 @@ namespace build2 n.dir.normalize (); - return search (*tt, move (n.dir), move (n.value), e, &s); + // @@ OUT: for now we assume the prerequisite's out is undetermined. + // Would need to pass a pair of names. + // + return search (*tt, n.dir, dir_path (), n.value, e, &s); } pair<const rule*, match_result> @@ -323,7 +326,9 @@ namespace build2 l6 ([&]{trace << "for " << t;}); - fsdir* r (&search<fsdir> (d, string (), nullptr, &s)); + // Target in the out tree, so out directory is empty. + // + fsdir* r (&search<fsdir> (d, dir_path (), string (), nullptr, &s)); match (a, *r); t.prerequisite_targets.emplace_back (r); return r; |