From f7e9830c0c413f05737002dcc8d06e73cb379980 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 1 Jul 2015 10:45:14 +0200 Subject: Group state support --- build/cli/rule | 3 --- build/cli/rule.cxx | 29 +---------------------------- 2 files changed, 1 insertion(+), 31 deletions(-) (limited to 'build/cli') diff --git a/build/cli/rule b/build/cli/rule index d52d0e0..21fcf8a 100644 --- a/build/cli/rule +++ b/build/cli/rule @@ -25,9 +25,6 @@ namespace build static target_state perform_clean (action, target&); - - static target_state - delegate (action, target&); }; } } diff --git a/build/cli/rule.cxx b/build/cli/rule.cxx index 2d001c4..6377b29 100644 --- a/build/cli/rule.cxx +++ b/build/cli/rule.cxx @@ -178,7 +178,7 @@ namespace build { cli_cxx& g (*static_cast (mr.target)); build::match (a, g); - return &delegate; + return group_recipe; } } @@ -281,25 +281,6 @@ namespace build } } - // Update member recipes. Without that the state update below - // won't stick. - // - if (!t.h ()->recipe (a)) - t.h ()->recipe (a, &delegate); - - if (!t.c ()->recipe (a)) - t.c ()->recipe (a, &delegate); - - if (t.i () != nullptr && !t.i ()->recipe (a)) - t.i ()->recipe (a, &delegate); - - // Update member states. - // - t.h ()->state = ts; - t.c ()->state = ts; - if (t.i () != nullptr) - t.i ()->state = ts; - return ts; } @@ -333,13 +314,5 @@ namespace build return r ? target_state::changed : ts; } - - target_state compile:: - delegate (action a, target& t) - { - // Delegate to our group. - // - return execute (a, *t.group); - } } } -- cgit v1.1