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

diff --git a/source/binary.cpp b/source/binary.cpp
index 55e517a..fcf30f1 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -59,9 +59,12 @@ void Binary::find_dependencies()
 		{
 			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<Target *> libs_to_process;
+		list<Target *>::iterator insert_pos = j;
+		++insert_pos;
 		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"))
@@ -70,27 +73,16 @@ 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)
-				libs_to_process.push_back(lib);
+			{
+				Target *real = lib->get_real_target();
+				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
+					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));
 		}
-
-		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();