Make sure we have libpaths for all static libs

diff --git a/source/component.cpp b/source/component.cpp
index 29bf9d10e692445bafe68c2e7095d46afa3fbadf..26a0ab4b7246d5c24eccd6f26c494fa0fea54335 100644 (file)
--- a/source/component.cpp
+++ b/source/component.cpp
@@ -48,6 +48,17 @@ void Component::create_build_info()
        for(StringList::iterator i=build_info.libpath.begin(); i!=build_info.libpath.end(); ++i)
                *i=(pkg.get_source() / *i).str();
 
+       if(pkg.get_library_mode()!=DYNAMIC)
+       {
+               // XXX This may pull in some unnecessary libpaths too.  More thought required.
+               PackageList reqs=pkg.collect_requires();
+               for(PackageList::iterator i=reqs.begin(); i!=reqs.end(); ++i)
+               {
+                       const BuildInfo &ebi=(*i)->get_exported_binfo();
+                       build_info.libpath.insert(build_info.libpath.end(), ebi.libpath.begin(), ebi.libpath.end());
+               }
+       }
+
        if(type==PROGRAM)
        {
                string strip=pkg.get_config().get_option("strip").value;