From 42131c57e7bc35765d94446f0be356bbceaf525b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 5 Sep 2018 17:36:20 +0200
Subject: Only consider common .pc file for binless variant if there is no
 binfull

---
 build2/cc/common.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'build2/cc/common.cxx')

diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index b20c2d8..6a1698e 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -750,7 +750,11 @@ namespace build2
 
           if (na || ns)
           {
-            pair<path, path> r (pkgconfig_search (d, p.proj, name));
+            // Only consider the common .pc file if we can be sure there
+            // is no binfull variant.
+            //
+            pair<path, path> r (
+              pkgconfig_search (d, p.proj, name, na && ns /* common */));
 
             if (na && !r.first.empty ())
             {
-- 
cgit v1.1