From 635f75c7b3fbb6053059827c73a4df52733850e0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 11 Feb 2021 09:08:55 +0200
Subject: Generalize process_libraries() to allow no picking installed library
 member

---
 libbuild2/cc/windows-rpath.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libbuild2/cc/windows-rpath.cxx')

diff --git a/libbuild2/cc/windows-rpath.cxx b/libbuild2/cc/windows-rpath.cxx
index eddb9c4..70eef73 100644
--- a/libbuild2/cc/windows-rpath.cxx
+++ b/libbuild2/cc/windows-rpath.cxx
@@ -56,14 +56,14 @@ namespace build2
       // We need to collect all the DLLs, so go into implementation of both
       // shared and static (in case they depend on shared).
       //
-      auto imp = [] (const file&, bool) {return true;};
+      auto imp = [] (const target&, bool) {return true;};
 
-      auto lib = [&r] (const file* const* lc,
+      auto lib = [&r] (const target* const* lc,
                        const string& f,
                        lflags,
                        bool sys)
       {
-        const file* l (lc != nullptr ? *lc : nullptr);
+        const file* l (lc != nullptr ? &(*lc)->as<file> () : nullptr);
 
         // We don't rpath system libraries.
         //
@@ -137,14 +137,14 @@ namespace build2
     {
       windows_dlls r;
 
-      auto imp = [] (const file&, bool) {return true;};
+      auto imp = [] (const target&, bool) {return true;};
 
-      auto lib = [&r, &bs] (const file* const* lc,
+      auto lib = [&r, &bs] (const target* const* lc,
                             const string& f,
                             lflags,
                             bool sys)
       {
-        const file* l (lc != nullptr ? *lc : nullptr);
+        const file* l (lc != nullptr ? &(*lc)->as<file> () : nullptr);
 
         if (sys)
           return;
-- 
cgit v1.1