X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=7b5bac8e1b0dae70d977cc68326b94aba438bdcd;hb=9f885c3eec8f065b7dc400acfb9dd67158284fcf;hp=0dcb62f01a057dfc66085f3524ccf5553d586cc5;hpb=2992094d86385f06bf9c86bb1d35ad8fe857f257;p=builder.git diff --git a/source/binary.cpp b/source/binary.cpp index 0dcb62f..7b5bac8 100644 --- a/source/binary.cpp +++ b/source/binary.cpp @@ -1,5 +1,7 @@ +#include #include #include +#include #include "binary.h" #include "builder.h" #include "component.h" @@ -7,6 +9,7 @@ #include "sharedlibrary.h" #include "sourcepackage.h" #include "staticlibrary.h" +#include "tool.h" using namespace std; using namespace Msp; @@ -16,54 +19,82 @@ Binary::Binary(Builder &b, const FS::Path &p): { } Binary::Binary(Builder &b, const Component &c, const string &p, const list &objs): - FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p) + FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p), + objects(objs) { component = &c; - for(list::const_iterator i=objs.begin(); i!=objs.end(); ++i) - add_depend(**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_depends() +void Binary::find_dependencies() { if(!component) return; - BuildInfo::LibraryMode libmode = component->get_build_info().libmode; + vector static_libs; + vector shared_libs; + vector missing_libs; + find_dependencies(this, static_libs, shared_libs, missing_libs); + + for(Target *t: static_libs) + add_dependency(*t); + for(Target *t: shared_libs) + add_dependency(*t); + for(const string &m: missing_libs) + problems.push_back(format("Required library %s not found", m)); +} + +void Binary::find_dependencies(Target *tgt, vector &static_libs, vector &shared_libs, vector &missing_libs) +{ + 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; + } - list queue; - list dep_libs; - queue.push_back(component); - while(!queue.empty()) + for(const string &l: binfo.libs) { - const Component *c = queue.front(); - queue.erase(queue.begin()); + if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework")) + continue; - const BuildInfo &binfo = c->get_build_info(); - for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i) + 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 *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode); - if(lib) + Target *real = lib->get_real_target(); + if(StaticLibrary *stlib = dynamic_cast(real)) { - dep_libs.push_back(lib); - - lib = lib->get_real_target(); - if(StaticLibrary *stlib = dynamic_cast(lib)) - if(stlib->get_component()) - queue.push_back(stlib->get_component()); + /* Keep only the last occurrence of each static library. This + ensures the order is correct for linking. */ + auto i = find(static_libs, stlib); + if(i!=static_libs.end()) + static_libs.erase(i); + static_libs.push_back(stlib); + find_dependencies(stlib, static_libs, shared_libs, missing_libs); } - else - builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name)); + else if(!any_equals(shared_libs, lib)) + shared_libs.push_back(lib); } - } - - /* Add only the last occurrence of each library to the actual dependencies. - This ensures that static library ordering is correct. */ - for(list::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i) - { - bool last = true; - for(list::iterator j=i; (last && j!=dep_libs.end()); ++j) - last = (j==i || *j!=*i); - if(last) - add_depend(**i); + else if(!any_equals(missing_libs, l)) + missing_libs.push_back(l); } }