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/config | |
| 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/config')
| -rw-r--r-- | build2/config/operation.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx index 8b0bb3d..1c395d2 100644 --- a/build2/config/operation.cxx +++ b/build2/config/operation.cxx @@ -550,8 +550,12 @@ namespace build2 // root in diagnostics. Not very clean but seems harmless. // target& t ( - targets.insert ( - dir::static_type, root.out_path (), "", nullptr, trace).first); + targets.insert (dir::static_type, + root.out_path (), + dir_path (), // Out tree. + "", + nullptr, + trace).first); if (!quiet) info << diag_done (a, t); |