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/operation.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/operation.cxx')
| -rw-r--r-- | build2/operation.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/build2/operation.cxx b/build2/operation.cxx index c5ba2fb..f8ce46f 100644 --- a/build2/operation.cxx +++ b/build2/operation.cxx @@ -54,11 +54,10 @@ namespace build2 // load_root_pre (root); - // Create the base scope. Note that its existence doesn't - // mean it was already setup as a base scope; it can be the - // same as root. + // Create the base scope. Note that its existence doesn't mean it was + // already setup as a base scope; it can be the same as root. // - auto i (scopes.insert (out_base, nullptr, true, false)); + auto i (scopes.insert (out_base, false)); scope& base (setup_base (i, out_base, src_base)); // Load the buildfile unless it has already been loaded. |