diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2018-08-25 17:40:21 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-08-25 17:40:21 +0200 |
commit | 32e04ad4b4a8dec07836b7c9fcf90fe72a006990 (patch) | |
tree | 8a0ce76d3a2f644396348fbf0d3d5d00bab82a0c /build2/cc/windows-rpath.cxx | |
parent | 236497a013790c879e9e798bd68083252b43b057 (diff) |
Implement missing pieces in utility libraries support
In particular, we can now build static libraries out of utility libraries.
Diffstat (limited to 'build2/cc/windows-rpath.cxx')
-rw-r--r-- | build2/cc/windows-rpath.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
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; |