1 files changed, 44 insertions, 15 deletions

diff --git a/libbuild2/build/script/runner.cxx b/libbuild2/build/script/runner.cxx
index 51139d4..5d9764b 100644
--- a/libbuild2/build/script/runner.cxx
+++ b/libbuild2/build/script/runner.cxx
@@ -28,12 +28,37 @@ namespace build2
         //
         for (auto i (env.cleanups.begin ()); i != env.cleanups.end (); )
         {
-          const target* m (&env.target);
-          for (; m != nullptr; m = m->adhoc_member)
+          const target* m (nullptr);
+          if (const group* g = env.target.is_a<group> ())
           {
-            if (const path_target* pm = m->is_a<path_target> ())
-              if (i->path == pm->path ())
-                break;
+            for (const target* gm: g->members)
+            {
+              if (const path_target* pm = gm->is_a<path_target> ())
+              {
+                if (i->path == pm->path ())
+                {
+                  m = gm;
+                  break;
+                }
+              }
+            }
+          }
+          else if (const fsdir* fd = env.target.is_a<fsdir> ())
+          {
+            // Compare ignoring the trailing directory separator.
+            //
+            if (path_traits::compare (i->path.string (),
+                                      fd->dir.string ()) == 0)
+              m = fd;
+          }
+          else
+          {
+            for (m = &env.target; m != nullptr; m = m->adhoc_member)
+            {
+              if (const path_target* pm = m->is_a<path_target> ())
+                if (i->path == pm->path ())
+                  break;
+            }
           }
 
           if (m != nullptr)
@@ -96,39 +121,43 @@ namespace build2
       void default_runner::
       run (environment& env,
            const command_expr& expr,
-           size_t li,
+           const iteration_index* ii, size_t li,
+           const function<command_function>& cf,
            const location& ll)
       {
         if (verb >= 3)
           text << ":  " << expr;
 
         // Run the expression if we are not in the dry-run mode or if it
-        // executes the set or exit builtin and just print the expression
-        // otherwise at verbosity level 2 and up.
+        // executes the set or exit builtin or it is a for-loop. Otherwise,
+        // just print the expression otherwise at verbosity level 2 and up.
         //
         if (!env.context.dry_run ||
             find_if (expr.begin (), expr.end (),
-                     [] (const expr_term& et)
+                     [&cf] (const expr_term& et)
                      {
                        const process_path& p (et.pipe.back ().program);
                        return p.initial == nullptr &&
                               (p.recall.string () == "set" ||
-                               p.recall.string () == "exit");
+                               p.recall.string () == "exit" ||
+                               (cf != nullptr &&
+                                p.recall.string () == "for"));
                      }) != expr.end ())
-          build2::script::run (env, expr, li, ll);
+          build2::script::run (env, expr, ii, li, ll, cf);
         else if (verb >= 2)
           text << expr;
       }
 
       bool default_runner::
-      run_if (environment& env,
-              const command_expr& expr,
-              size_t li, const location& ll)
+      run_cond (environment& env,
+                const command_expr& expr,
+                const iteration_index* ii, size_t li,
+                const location& ll)
       {
         if (verb >= 3)
           text << ": ?" << expr;
 
-        return build2::script::run_if (env, expr, li, ll);
+        return build2::script::run_cond (env, expr, ii, li, ll);
       }
     }
   }