X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstaticlibrary.cpp;h=5ff84770021f4b67af5b64e0c505f14f7e586a62;hb=42d80b43a463627e0e7edf6df3be9bd4b976d74c;hp=2bb17fc04b9ff47b1f0552039f04687a2cc571f5;hpb=69cdee2c53972c1dd7e1b9d83ddcd8f6c3c589f7;p=builder.git

diff --git a/source/staticlibrary.cpp b/source/staticlibrary.cpp
index 2bb17fc..5ff8477 100644
--- a/source/staticlibrary.cpp
+++ b/source/staticlibrary.cpp
@@ -12,13 +12,15 @@ StaticLibrary::StaticLibrary(Builder &b, const FS::Path &p):
 { }
 
 StaticLibrary::StaticLibrary(Builder &b, const Component &c, const list<ObjectFile *> &objs):
-	FileTarget(b, c.get_package(), c.get_package().get_out_dir()/generate_filename(c))
+	FileTarget(b, c.get_package(), c.get_package().get_output_directory()/generate_filename(c))
 {
 	component = &c;
 	for(list<ObjectFile *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
 		add_dependency(**i);
 
 	install_location = "lib";
+	nested_build_sig = true;
+	arch_in_build_sig = true;
 }
 
 string StaticLibrary::generate_filename(const Component &comp)
@@ -26,3 +28,14 @@ string StaticLibrary::generate_filename(const Component &comp)
 	const Architecture &arch = comp.get_package().get_builder().get_current_arch();
 	return arch.get_static_library_patterns().front().apply(comp.get_name());
 }
+
+void StaticLibrary::add_required_library(const string &lib)
+{
+	build_info.libs.push_back(lib);
+}
+
+void StaticLibrary::collect_build_info(BuildInfo &binfo) const
+{
+	Target::collect_build_info(binfo);
+	binfo.update_from(build_info);
+}