From 32e04ad4b4a8dec07836b7c9fcf90fe72a006990 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 25 Aug 2018 17:40:21 +0200
Subject: Implement missing pieces in utility libraries support

In particular, we can now build static libraries out of utility libraries.
---
 build2/cc/windows-rpath.cxx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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

diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx
index c710e66..268bab2 100644
--- a/build2/cc/windows-rpath.cxx
+++ b/build2/cc/windows-rpath.cxx
@@ -59,8 +59,13 @@ namespace build2
       //
       auto imp = [] (const file&, bool) {return true;};
 
-      auto lib = [&r] (const file* l, const string& f, lflags, bool sys)
+      auto lib = [&r] (const file* const* lc,
+                       const string& f,
+                       lflags,
+                       bool sys)
       {
+        const file* l (lc != nullptr ? *lc : nullptr);
+
         // We don't rpath system libraries.
         //
         if (sys)
@@ -135,8 +140,13 @@ namespace build2
 
       auto imp = [] (const file&, bool) {return true;};
 
-      auto lib = [&r, &bs] (const file* l, const string& f, lflags, bool sys)
+      auto lib = [&r, &bs] (const file* const* lc,
+                            const string& f,
+                            lflags,
+                            bool sys)
       {
+        const file* l (lc != nullptr ? *lc : nullptr);
+
         if (sys)
           return;
 
-- 
cgit v1.1