From f62ff2e840fd92a03b4a3298de938d426f8b5c7a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 14 Aug 2015 15:47:34 +0200 Subject: Fix several issues in outer operation recipe override logic --- build/target | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'build/target') diff --git a/build/target b/build/target index dd58b24..35b013a 100644 --- a/build/target +++ b/build/target @@ -328,29 +328,7 @@ namespace build recipe (action_type a) const {return a > action ? empty_recipe : recipe_;} void - recipe (action_type a, recipe_type r) - { - assert (a > action || !recipe_); - action = a; - recipe_ = std::move (r); - - // Also reset the target state. If this is a noop recipe, then - // mark the target unchanged so that we don't waste time executing - // the recipe. If this is a group recipe, then mark the state as - // coming from the group. - // - raw_state = target_state::unknown; - - if (recipe_function** f = recipe_.target ()) - { - if (*f == &noop_action) - raw_state = target_state::unchanged; - else if (*f == &group_action) - raw_state = target_state::group; - } - - dependents = 0; - } + recipe (action_type, recipe_type); // Target type info. // -- cgit v1.1