X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=24a022febd10e1a0ed711bfee58782a99ad75880;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=158a4d4fee9f70c359d4e22ea1c6255aa82c098f;hpb=000deb52a1374bcedfec5d201c53c1842438ceba;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 158a4d4..24a022f 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -18,21 +18,18 @@ GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
 {
 	set_command("ar", true);
 	input_suffixes.push_back(".o");
+	processing_unit = COMPONENT;
 }
 
-Target *GnuArchiver::create_target(const list<Target *> &sources, const string &)
+Target *GnuArchiver::create_target(const vector<Target *> &sources, const string &)
 {
 	if(sources.empty())
 		throw invalid_argument("GnuArchiver::create_target");
 
-	list<ObjectFile *> objs;
-	for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-	{
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
-			objs.push_back(obj);
-		else
-			throw invalid_argument("GnuArchiver::create_target");
-	}
+	vector<ObjectFile *> objs;
+	objs.reserve(sources.size());
+	for(Target *s: sources)
+		objs.push_back(&dynamic_cast<ObjectFile &>(*s));
 
 	const Component &comp = *objs.front()->get_component();
 	StaticLibrary *lib = new StaticLibrary(builder, comp, objs);
@@ -40,11 +37,6 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 	return lib;
 }
 
-string GnuArchiver::create_build_signature(const BuildInfo &) const
-{
-	return FS::basename(executable->get_path());
-}
-
 Task *GnuArchiver::run(const Target &target) const
 {
 	const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
@@ -58,9 +50,8 @@ Task *GnuArchiver::run(const Target &target) const
 
 	argv.push_back(relative(lib.get_path(), work_dir).str());
 
-	const Target::Dependencies &deps = lib.get_dependencies();
-	for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
+	for(Target *d: lib.get_dependencies())
+		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
 
 	return new ExternalTask(argv, work_dir);