diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-01-27 15:25:26 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:42:41 +0200 |
| commit | f93038fbee1631b95922b0742e0fd00fa8dae02e (patch) | |
| tree | 6fe67cbde528ee8ded490085b9a8d5adc0ce5aca /build2/file.cxx | |
| parent | 267d34d2800d9cc3ed2865cbecf8d32f8f1ab6ec (diff) | |
Add notion of phase, enforce
Diffstat (limited to 'build2/file.cxx')
| -rw-r--r-- | build2/file.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build2/file.cxx b/build2/file.cxx index 9440738..72d2807 100644 --- a/build2/file.cxx +++ b/build2/file.cxx @@ -892,6 +892,8 @@ namespace build2 // over anything that we may discover. In particular, we will prefer it // over any bundled subprojects. // + auto& vp (var_pool.rw (iroot)); + for (;;) // Break-out loop. { string n ("config.import." + proj); @@ -901,8 +903,7 @@ namespace build2 // Note: overridable variable with path auto-completion. // { - const variable& var ( - var_pool.rw (ibase).insert<abs_dir_path> (n, true)); + const variable& var (vp.insert<abs_dir_path> (n, true)); if (auto l = iroot[var]) { @@ -931,9 +932,9 @@ namespace build2 // if (!target.value.empty ()) { - auto lookup = [&iroot, &loc] (string name) -> path + auto lookup = [&iroot, &vp, &loc] (string name) -> path { - const variable& var (var_pool.rw (iroot).insert<path> (name, true)); + const variable& var (vp.insert<path> (name, true)); path r; if (auto l = iroot[var]) |