X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=ffffaa56feed8a1ad15f9472c86f47d3f748f834;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=079ae84995843d669f632789030e4bbb24bde69d;hpb=c51411c4b3ed4e6a0d8343b848db3dc736bc7857;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 079ae84..ffffaa5 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
@@ -17,13 +18,13 @@ Binary::Binary(Builder &b, const FS::Path &p):
 	FileTarget(b, p)
 { }
 
-Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
+Binary::Binary(Builder &b, const Component &c, const string &p, const vector<ObjectFile *> &objs):
 	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
 	objects(objs)
 {
 	component = &c;
-	for(list<ObjectFile *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-		add_dependency(**i);
+	for(ObjectFile *o: objects)
+		add_dependency(*o);
 
 	nested_build_sig = true;
 	arch_in_build_sig = true;
@@ -31,11 +32,13 @@ Binary::Binary(Builder &b, const Component &c, const string &p, const list<Objec
 
 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())
+	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_dependencies()
@@ -43,49 +46,55 @@ void Binary::find_dependencies()
 	if(!component)
 		return;
 
-	list<const Component *> queue;
-	list<Target *> dep_libs;
-	set<string> missing_libs;
-	queue.push_back(component);
-	while(!queue.empty())
+	vector<Target *> static_libs;
+	vector<Target *> shared_libs;
+	vector<string> 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<Target *> &static_libs, vector<Target *> &shared_libs, vector<string> &missing_libs)
+{
+	BuildInfo binfo;
+	tgt->collect_build_info(binfo);
+	if(tgt!=this)
 	{
-		queue.erase(queue.begin());
+		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;
+	}
 
-		BuildInfo binfo;
-		collect_build_info(binfo);
+	for(const string &l: binfo.libs)
+	{
+		if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework"))
+			continue;
 
-		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)
 		{
-			if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework"))
-				continue;
-
-			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))
 			{
-				Target *real = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(real))
-				{
-					dep_libs.push_back(stlib);
-					if(stlib->get_component())
-						queue.push_back(stlib->get_component());
-				}
-				else
-					dep_libs.push_back(lib);
+				/* 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 if(missing_libs.insert(*i).second)
-				problems.push_back(format("Required library %s not found", *i));
+			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<Target *>::iterator i=dep_libs.begin(); i!=dep_libs.end(); ++i)
-	{
-		bool last = true;
-		for(list<Target *>::iterator j=i; (last && j!=dep_libs.end()); ++j)
-			last = (j==i || *j!=*i);
-		if(last)
-			add_dependency(**i);
+		else if(!any_equals(missing_libs, l))
+			missing_libs.push_back(l);
 	}
 }