From c2001eb367b9b82e26689cad6f1f74f46c72b904 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 27 Apr 2017 08:29:52 +0200
Subject: Pass target to prerequisite search

---
 build2/cli/rule.cxx   | 9 ++++++---
 build2/cli/target.cxx | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'build2/cli')

diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx
index 7b191ea..884635a 100644
--- a/build2/cli/rule.cxx
+++ b/build2/cli/rule.cxx
@@ -86,11 +86,14 @@ namespace build2
         // At this stage, no further changes to cli.options are possible and
         // we can determine whether the --suppress-inline option is present.
         //
-        t.h = &search<cxx::hxx> (t.dir, t.out, t.name);
-        t.c = &search<cxx::cxx> (t.dir, t.out, t.name);
+        // Passing the group as a "reference target" is a bit iffy,
+        // conceptually.
+        //
+        t.h = &search<cxx::hxx> (t, t.dir, t.out, t.name);
+        t.c = &search<cxx::cxx> (t, t.dir, t.out, t.name);
         t.i = find_option ("--suppress-inline", t, "cli.options")
           ? nullptr
-          : &search<cxx::ixx> (t.dir, t.out, t.name);
+          : &search<cxx::ixx> (t, t.dir, t.out, t.name);
 
         return r;
       }
diff --git a/build2/cli/target.cxx b/build2/cli/target.cxx
index e3ce7e2..2199f79 100644
--- a/build2/cli/target.cxx
+++ b/build2/cli/target.cxx
@@ -24,7 +24,7 @@ namespace build2
       &target_extension_var<cli_ext_var, cli_ext_def>,
       &target_pattern_var<cli_ext_var, cli_ext_def>,
       nullptr,
-      &search_file,
+      &file_search,
       false
     };
 
@@ -70,7 +70,7 @@ namespace build2
       nullptr,
       nullptr,
       nullptr,
-      &search_target,
+      &target_search,
       true // "See through" default iteration mode.
     };
   }
-- 
cgit v1.1