X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinarypackage.cpp;h=aa1aed3c2fce4a0ecbfc7214299621724df27fdf;hb=92d81529ec8f3b84f5471162d0b27914eff7adb5;hp=bed4c90b9875e63331f6676ab51ade95b767977e;hpb=42d80b43a463627e0e7edf6df3be9bd4b976d74c;p=builder.git

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index bed4c90..aa1aed3 100644
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -76,6 +76,7 @@ void BinaryPackage::do_prepare()
 	if(base_path.empty())
 	{
 		// TODO report which files were not found
+		builder.get_logger().log("problems", format("Cannot locate files for %s", name));
 		problems.push_back("Cannot locate files");
 		return;
 	}
@@ -97,12 +98,17 @@ void BinaryPackage::do_prepare()
 
 	if(!static_binfo.libs.empty())
 	{
+		BuildInfo::PathList combined_libpath = static_binfo.libpath;
+		combined_libpath.insert(combined_libpath.end(), export_binfo.libpath.begin(), export_binfo.libpath.end());
+
 		for(BuildInfo::WordList::const_iterator i=export_binfo.libs.begin(); i!=export_binfo.libs.end(); ++i)
 			if(Target *lib = builder.get_vfs().find_library(*i, export_binfo.libpath, BuildInfo::FORCE_STATIC, system))
 				if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(lib))
 				{
 					for(BuildInfo::WordList::const_iterator j=static_binfo.libs.begin(); j!=static_binfo.libs.end(); ++j)
 						stlib->add_required_library(*j);
+					for(BuildInfo::PathList::const_iterator j=combined_libpath.begin(); j!=combined_libpath.end(); ++j)
+						stlib->add_library_path(*j);
 				}
 	}
 }