diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2019-08-22 16:08:45 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2019-08-22 16:16:32 +0200 |
commit | 708b092956f10b5c05641f90d55b209e887d52de (patch) | |
tree | 418b2ba2b214fc6af857d75301e5301d4fe0322b /libbuild2/target.cxx | |
parent | 4f5b6cb7ed4e05e98cce7e692462f49e24b7a39a (diff) |
Run phase
Diffstat (limited to 'libbuild2/target.cxx')
-rw-r--r-- | libbuild2/target.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbuild2/target.cxx b/libbuild2/target.cxx index 9749e94..977c75c 100644 --- a/libbuild2/target.cxx +++ b/libbuild2/target.cxx @@ -365,7 +365,7 @@ namespace build2 // We sometimes call insert() even if we expect to find an existing // target in order to keep the same code (see cc/search_library()). // - assert (phase != run_phase::execute); + assert (ctx.phase != run_phase::execute); optional<string> e ( tt.fixed_extension != nullptr @@ -430,7 +430,7 @@ namespace build2 { // The implied flag can only be cleared during the load phase. // - assert (phase == run_phase::load); + assert (ctx.phase == run_phase::load); // Clear the implied flag. // @@ -536,7 +536,7 @@ namespace build2 // const mtime_target* t (this); - switch (phase) + switch (ctx.phase) { case run_phase::load: break; case run_phase::match: @@ -893,11 +893,11 @@ namespace build2 // bool retest (false); - assert (phase == run_phase::match); + assert (t.ctx.phase == run_phase::match); { // Switch the phase to load. // - phase_switch ps (run_phase::load); + phase_switch ps (t.ctx, run_phase::load); // This is subtle: while we were fussing around another thread may // have loaded the buildfile. So re-test now that we are in exclusive @@ -937,7 +937,7 @@ namespace build2 } } } - assert (phase == run_phase::match); + assert (t.ctx.phase == run_phase::match); // If we loaded/implied the buildfile, examine the target again. // |