+#include <algorithm>
#include <msp/fs/utils.h>
#include <msp/strings/format.h>
#include <msp/strings/utils.h>
objects(objs)
{
component = &c;
- for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
- add_dependency(**i);
+ for(ObjectFile *o: objects)
+ add_dependency(*o);
+
+ nested_build_sig = true;
+ arch_in_build_sig = true;
+}
+
+void Binary::collect_build_info(BuildInfo &binfo) const
+{
+ for(ObjectFile *o: objects)
+ if(const Tool *obj_tool = o->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);
- while(!queue.empty())
+ queue.push_back(this);
+ for(auto j=queue.begin(); j!=queue.end(); ++j)
{
- const Component *c = queue.front();
- queue.erase(queue.begin());
+ Target *tgt = *j;
+
+ BuildInfo 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());
+ if(binfo.threads)
+ static_binfo.threads = true;
+ }
- const BuildInfo &binfo = c->get_build_info();
- for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
+ auto insert_pos = j;
+ ++insert_pos;
+ for(const string &l: binfo.libs)
{
- if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
+ if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
continue;
- BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
- Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
+ BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(l);
+ Target *lib = builder.get_vfs().find_library(l, binfo.libpath, libmode);
if(lib)
{
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);
}
- else if(missing_libs.insert(*i).second)
- problems.push_back(format("Required library %s not found", *i));
+ else if(missing_libs.insert(l).second)
+ problems.push_back(format("Required library %s not found", l));
}
}
+ 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)
- {
- bool last = true;
- for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
- last = (j==i || *j!=*i);
- if(last)
+ for(auto i=dep_libs.begin(); i!=dep_libs.end(); ++i)
+ if(!any_of(next(i), dep_libs.end(), [i](Target *d){ return d==*i; }))
add_dependency(**i);
- }
-}
-
-string Binary::create_build_signature() const
-{
- set<const Tool *> object_tools;
- for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
- object_tools.insert((*i)->get_tool());
-
- list<string> sigs;
- for(set<const Tool *>::const_iterator i=object_tools.begin(); i!=object_tools.end(); ++i)
- sigs.push_back((*i)->create_build_signature(component->get_build_info()));
- sigs.sort();
- sigs.push_front(tool->create_build_signature(component->get_build_info()));
- if(const Architecture *arch = tool->get_architecture())
- sigs.push_front(arch->get_name());
-
- return join(sigs.begin(), sigs.end(), ";");
}