X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbinary.cpp;h=0dcb62f01a057dfc66085f3524ccf5553d586cc5;hb=ef97eadef58922f45e1ba86a1d009db5ea41dd50;hp=6c915de9749de661620696e07904ab8193371b39;hpb=af52dd8fd91fd0ef3dcd0faff524b4508c946aef;p=builder.git

diff --git a/source/binary.cpp b/source/binary.cpp
index 6c915de..0dcb62f 100644
--- a/source/binary.cpp
+++ b/source/binary.cpp
@@ -28,10 +28,7 @@ void Binary::find_depends()
 	if(!component)
 		return;
 
-	const SourcePackage &spkg = component->get_package();
-	LibMode libmode = spkg.get_library_mode();
-	if(dynamic_cast<SharedLibrary *>(this) && libmode<DYNAMIC)
-		libmode = DYNAMIC;
+	BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
 
 	list<const Component *> queue;
 	list<Target *> dep_libs;
@@ -41,12 +38,10 @@ void Binary::find_depends()
 		const Component *c = queue.front();
 		queue.erase(queue.begin());
 
-		const BuildInfo::PathList &libpath = c->get_build_info().libpath;
-
-		const BuildInfo::WordList &libs = c->get_build_info().libs;
-		for(BuildInfo::WordList::const_iterator i=libs.begin(); i!=libs.end(); ++i)
+		const BuildInfo &binfo = c->get_build_info();
+		for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
 		{
-			Target *lib = builder.get_vfs().find_library(*i, libpath, libmode);
+			Target *lib = builder.get_vfs().find_library(*i, binfo.libpath, libmode);
 			if(lib)
 			{
 				dep_libs.push_back(lib);
@@ -57,7 +52,7 @@ void Binary::find_depends()
 						queue.push_back(stlib->get_component());
 			}
 			else
-				builder.problem(spkg.get_name(), format("Couldn't find library %s for %s", *i, name));
+				builder.problem(package->get_name(), format("Couldn't find library %s for %s", *i, name));
 		}
 	}