aboutsummaryrefslogtreecommitdiff
path: root/build/target
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-08-14 15:47:34 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-08-14 15:47:34 +0200
commitf62ff2e840fd92a03b4a3298de938d426f8b5c7a (patch)
treeaf8c7a85c5bdc4bd8bc60632aa6929cb27b98284 /build/target
parent9fa5209175dffb881e8ec6c5f6ad4fc54448244a (diff)
Fix several issues in outer operation recipe override logic
Diffstat (limited to 'build/target')
-rw-r--r--build/target24
1 files changed, 1 insertions, 23 deletions
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<recipe_function*> ())
- {
- 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.
//