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

diff --git a/source/binary.cpp b/source/binary.cpp
index d56ab17..9f0bfcd 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,8 +31,6 @@ void Binary::find_dependencies()
 	if(!component)
 		return;
 
-	BuildInfo::LibraryMode libmode = component->get_build_info().libmode;
-
 	list<const Component *> queue;
 	list<Target *> dep_libs;
 	queue.push_back(component);
@@ -44,15 +42,19 @@ 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));