From 1c7cbb302b1c6e41eb0c5cecfc655532f1919cba Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 28 Jul 2017 13:46:26 +0200
Subject: Implement support for linking whole archive

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

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

diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx
index 1fc195a..2f4f31f 100644
--- a/build2/cc/windows-rpath.cxx
+++ b/build2/cc/windows-rpath.cxx
@@ -58,7 +58,7 @@ namespace build2
       //
       auto imp = [] (const file&, bool) {return true;};
 
-      auto lib = [&r] (const file* l, const string& f, bool sys)
+      auto lib = [&r] (const file* l, const string& f, lflags, bool sys)
       {
         // We don't rpath system libraries.
         //
@@ -102,7 +102,7 @@ namespace build2
           r = t;
       };
 
-      for (const target* pt: t.prerequisite_targets)
+      for (auto pt: t.prerequisite_targets)
       {
         const file* f;
         const liba* a;
@@ -110,7 +110,7 @@ namespace build2
         if ((f = a = pt->is_a<liba> ()) ||
             (f =     pt->is_a<libs> ()))
           process_libraries (act, bs, li, sys_lib_dirs,
-                             *f, a != nullptr,
+                             *f, a != nullptr, pt.data,
                              imp, lib, nullptr, true);
       }
 
@@ -130,7 +130,7 @@ namespace build2
 
       auto imp = [] (const file&, bool) {return true;};
 
-      auto lib = [&r] (const file* l, const string& f, bool sys)
+      auto lib = [&r] (const file* l, const string& f, lflags, bool sys)
       {
         if (sys)
           return;
@@ -184,7 +184,7 @@ namespace build2
         }
       };
 
-      for (const target* pt: t.prerequisite_targets)
+      for (auto pt: t.prerequisite_targets)
       {
         const file* f;
         const liba* a;
@@ -192,7 +192,7 @@ namespace build2
         if ((f = a = pt->is_a<liba> ()) ||
             (f =     pt->is_a<libs> ()))
           process_libraries (act, bs, li, sys_lib_dirs,
-                             *f, a != nullptr,
+                             *f, a != nullptr, pt.data,
                              imp, lib, nullptr, true);
       }
 
-- 
cgit v1.1