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

diff --git a/source/binarypackage.cpp b/source/binarypackage.cpp
index bed4c90..5415f25 100644
--- a/source/binarypackage.cpp
+++ b/source/binarypackage.cpp
@@ -97,12 +97,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);
 				}
 	}
 }