diff options
Diffstat (limited to 'libbuild2/target.ixx')
| -rw-r--r-- | libbuild2/target.ixx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/libbuild2/target.ixx b/libbuild2/target.ixx index 39b81e7..5e24b20 100644 --- a/libbuild2/target.ixx +++ b/libbuild2/target.ixx @@ -286,6 +286,7 @@ namespace build2 // @@ Hm, I wonder why not just return s.recipe_group_action now that we // cache it. // + const opstate& s (state[a]); // This special hack allows us to do things like query an ad hoc member's // state or mtime without matching/executing the member, only the group. @@ -293,14 +294,17 @@ namespace build2 // this feels harmless (ad hoc membership cannot be changed during the // execute phase). // + // Note: if the member state is postponed, then the group state may not be + // yet known (see group_action() for details). + // // Note: this test must come first since the member may not be matched and - // thus its state uninitialized. + // thus its state set (but it won't be postponed; see opstate::state). // - if (ctx.phase == run_phase::execute && adhoc_group_member ()) + if (ctx.phase == run_phase::execute && + adhoc_group_member () && + s.state != target_state::postponed) return true; - const opstate& s (state[a]); - if (s.state == target_state::group) return true; @@ -342,7 +346,14 @@ namespace build2 inline target_state target:: executed_state_impl (action a) const { - return (group_state (a) ? group->state : state)[a].state; + target_state ts ((group_state (a) ? group->state : state)[a].state); + + // Translate postponed to unchanged, similar to execute_recipe(). + // + if (ts == target_state::postponed) + ts = target_state::unchanged; + + return ts; } inline target_state target:: |