Collect libpath for static library dependencies from the libs themselves

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 6efe77a6475b5ce74fc18d9c2435910b3734f5a8..f3654f42f906767d2a41464117f3e2a52ceccb9b 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -29,21 +29,35 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
        arch_in_build_sig = true;
 }
 
+void Binary::collect_build_info(BuildInfo &binfo) const
+{
+       for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               if(const Tool *obj_tool = (*i)->get_tool())
+                       binfo.update_from(obj_tool->get_build_info());
+
+       Target::collect_build_info(binfo);
+
+       binfo.update_from(static_binfo);
+}
+
 void Binary::find_dependencies()
 {
        if(!component)
                return;
 
-       list<const Component *> queue;
+       list<Target *> queue;
        list<Target *> dep_libs;
        set<string> missing_libs;
-       queue.push_back(component);
+       queue.push_back(this);
        while(!queue.empty())
        {
-               queue.erase(queue.begin());
+               Target *tgt = queue.front();
+               queue.pop_front();
 
                BuildInfo binfo;
-               collect_build_info(binfo);
+               tgt->collect_build_info(binfo);
+               if(tgt!=this)
+                       static_binfo.libpath.insert(static_binfo.libpath.end(), binfo.libpath.begin(), binfo.libpath.end());
 
                for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                {
@@ -58,8 +72,7 @@ void Binary::find_dependencies()
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
                                {
                                        dep_libs.push_back(stlib);
-                                       if(stlib->get_component())
-                                               queue.push_back(stlib->get_component());
+                                       queue.push_back(stlib);
                                }
                                else
                                        dep_libs.push_back(lib);