X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=55e517a6190ffbb36075616593b3f71110e152bf;hb=21ca3e98081c0dc0430d8e5301591aa71ec4fca2;hp=f3654f42f906767d2a41464117f3e2a52ceccb9b;hpb=45571f0fffaf483d07d92f56ae20f00218b7463c;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index f3654f4..55e517a 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -49,16 +49,19 @@ void Binary::find_dependencies()
 	list<Target *> dep_libs;
 	set<string> missing_libs;
 	queue.push_back(this);
-	while(!queue.empty())
+	for(list<Target *>::iterator j=queue.begin(); j!=queue.end(); ++j)
 	{
-		Target *tgt = queue.front();
-		queue.pop_front();
+		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());
+		}
 
+		list<Target *> libs_to_process;
 		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"))
@@ -67,21 +70,32 @@ void Binary::find_dependencies()
 			BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
 			Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
 			if(lib)
-			{
-				Target *real = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-				{
-					dep_libs.push_back(stlib);
-					queue.push_back(stlib);
-				}
-				else
-					dep_libs.push_back(lib);
-			}
+				libs_to_process.push_back(lib);
 			else if(missing_libs.insert(*i).second)
 				problems.push_back(format("Required library %s not found", *i));
 		}
+
+		if(tgt!=this)
+		{
+			const Target::Dependencies &tdeps = tgt->get_transitive_dependencies();
+			libs_to_process.insert(libs_to_process.end(), tdeps.begin(), tdeps.end());
+		}
+
+		list<Target *>::iterator insert_pos = j;
+		++insert_pos;
+		for(list<Target *>::const_iterator i=libs_to_process.begin(); i!=libs_to_process.end(); ++i)
+		{
+			Target *real = (*i)->get_real_target();
+			if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+				queue.insert(insert_pos, stlib);
+			else
+				dep_libs.push_back(*i);
+		}
 	}
 
+	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)