Add a list of symbols to keep in the binary to BuildInfo

[builder.git] / source / binary.cpp

diff --git a/source/binary.cpp b/source/binary.cpp
index 079ae84995843d669f632789030e4bbb24bde69d..448292cf051a5899412ba89329888053312276cc 100644 (file)
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -36,6 +36,8 @@ void Binary::collect_build_info(BuildInfo &binfo) const
                        binfo.update_from(obj_tool->get_build_info());
 
        Target::collect_build_info(binfo);
+
+       binfo.update_from(static_binfo);
 }
 
 void Binary::find_dependencies()
@@ -43,17 +45,24 @@ 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);
-       while(!queue.empty())
+       queue.push_back(this);
+       for(list<Target *>::iterator j=queue.begin(); j!=queue.end(); ++j)
        {
-               queue.erase(queue.begin());
+               Target *tgt = *j;
 
                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());
+                       static_binfo.keep_symbols.insert(static_binfo.keep_symbols.end(), binfo.keep_symbols.begin(), binfo.keep_symbols.end());
+               }
 
+               list<Target *>::iterator insert_pos = j;
+               ++insert_pos;
                for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
                {
                        if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
@@ -65,11 +74,7 @@ void Binary::find_dependencies()
                        {
                                Target *real = lib->get_real_target();
                                if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-                               {
-                                       dep_libs.push_back(stlib);
-                                       if(stlib->get_component())
-                                               queue.push_back(stlib->get_component());
-                               }
+                                       queue.insert(insert_pos, stlib);
                                else
                                        dep_libs.push_back(lib);
                        }
@@ -78,6 +83,9 @@ void Binary::find_dependencies()
                }
        }
 
+       queue.pop_front();
+       dep_libs.splice(dep_libs.begin(), queue);
+
        /* Add only the last occurrence of each library to the actual dependencies.
        This ensures that static library ordering is correct. */
        for(list<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)