X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=a3f3c9b4ec71dd4c70439b1150fcb2cd996a8366;hb=43d1143e6dc6bbf3797dbaae42d4bfce3dea5d88;hp=d56ab17b0b59020ae30dc2825654d6c186b485b9;hpb=03227882aef8b448065e6ca9cda9b7722b7a9753;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index d56ab17..a3f3c9b 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -18,7 +18,7 @@ Binary::Binary(Builder &b, const FS::Path &p):
 { }
 
 Binary::Binary(Builder &b, const Component &c, const string &p, const list<ObjectFile *> &objs):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/p),
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/p),
 	objects(objs)
 {
 	component = &c;
@@ -31,10 +31,9 @@ void Binary::find_dependencies()
 	if(!component)
 		return;
 
-	BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
-
 	list<const Component *> queue;
 	list<Target *> dep_libs;
+	set<string> missing_libs;
 	queue.push_back(component);
 	while(!queue.empty())
 	{
@@ -44,18 +43,22 @@ void Binary::find_dependencies()
 		const BuildInfo &binfo = c->get_build_info();
 		for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
 		{
+			BuildInfo::LibraryMode libmode = component->get_build_info().get_libmode_for(*i);
 			Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
 			if(lib)
 			{
-				dep_libs.push_back(lib);
-
-				lib = lib->get_real_target();
-				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
+				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);
 			}
-			else
-				builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name));
+			else if(missing_libs.insert(*i).second)
+				problems.push_back(format("Required library %s not found", *i));
 		}
 	}
 
@@ -78,10 +81,12 @@ string Binary::create_build_signature() const
 		object_tools.insert((*i)->get_tool());
 
 	list<string> sigs;
-	sigs.push_back(tool->create_build_signature(component->get_build_info()));
 	for(set<const Tool *>::const_iterator i=object_tools.begin(); i!=object_tools.end(); ++i)
 		sigs.push_back((*i)->create_build_signature(component->get_build_info()));
 	sigs.sort();
+	sigs.push_front(tool->create_build_signature(component->get_build_info()));
+	if(const Architecture *arch = tool->get_architecture())
+		sigs.push_front(arch->get_name());
 
 	return join(sigs.begin(), sigs.end(), ";");
 }