From a2cad68fe340a66ad54b93f88e39f97898fc462e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 1 Aug 2017 10:49:09 +0200
Subject: Reimplement pkg-config generation with more conservative approach for
 now

---
 build2/algorithm.ixx | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'build2/algorithm.ixx')

diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx
index 5680288..03b4604 100644
--- a/build2/algorithm.ixx
+++ b/build2/algorithm.ixx
@@ -274,15 +274,14 @@ namespace build2
     l.offset = target::offset_applied;
   }
 
-  inline pair<recipe, action>
+  inline recipe
   match_delegate (action a, target& t, const rule& r, bool fail)
   {
     assert (phase == run_phase::match);
     auto mr (match_impl (a, t, &r, fail));
-    return make_pair (mr.first != nullptr
-                      ? apply_impl (t, *mr.first, mr.second)
-                      : empty_recipe,
-                      mr.second);
+    return mr.first != nullptr
+      ? apply_impl (t, *mr.first, mr.second)
+      : empty_recipe;
   }
 
   group_view
-- 
cgit v1.1