From 0dd3d23846e7fdb729359a57d3f4b190f65aed55 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 17 Jan 2013 11:01:15 +0200 Subject: [PATCH] Handle "use"d libraries through build info --- source/component.cpp | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/source/component.cpp b/source/component.cpp index db78917..9ffbbf3 100644 --- a/source/component.cpp +++ b/source/component.cpp @@ -79,6 +79,8 @@ void Component::create_build_info() for(SourceList::const_iterator j=use_sources.begin(); j!=use_sources.end(); ++j) base = FS::common_ancestor(base, *j); build_info.incpath.push_back(base); + build_info.libs.push_back((*i)->get_name()); + build_info.libmodes[(*i)->get_name()] = BuildInfo::STATIC; } if(type==LIBRARY || type==MODULE) @@ -203,24 +205,6 @@ void Component::create_targets() const else results.push_back(linker.create_target(objs)); - const Target::Dependencies &world_deps = builder.get_target("world")->get_dependencies(); - for(UseList::const_iterator i=uses.begin(); i!=uses.end(); ++i) - { - /* The world target depends on all primary targets; look for the - static library belonging to the component. This is a bit roundabout - way but gets the job done. */ - bool found = false; - for(Target::Dependencies::const_iterator j=world_deps.begin(); j!=world_deps.end(); ++j) - if((*j)->get_component()==*i && dynamic_cast(*j)) - { - results.front()->add_dependency(**j); - found = true; - break; - } - if(!found) - builder.problem(package.get_name(), format("Can't find static library %s for component %s", (*i)->get_name(), name)); - } - for(list::const_iterator i=results.begin(); i!=results.end(); ++i) { builder.add_primary_target(**i); -- 2.45.2