X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbinary.cpp;h=079ae84995843d669f632789030e4bbb24bde69d;hb=cee450d7cc932811b0d119a132bc9981eb480584;hp=df0daaff72c51dc46a3a1607f940482e966a871f;hpb=8575b50479945c3ad6ab0e4ea7eb116da5b5f04d;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index df0daaf..079ae84 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -29,6 +29,15 @@ 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);
+}
+
 void Binary::find_dependencies()
 {
 	if(!component)
@@ -40,10 +49,11 @@ void Binary::find_dependencies()
 	queue.push_back(component);
 	while(!queue.empty())
 	{
-		const Component *c = queue.front();
 		queue.erase(queue.begin());
 
-		const BuildInfo &binfo = c->get_build_info();
+		BuildInfo binfo;
+		collect_build_info(binfo);
+
 		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"))