X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=f802031f0ee8ea83d12eba4da1019dcb9d2e7142;hb=45dd0aa6e8f2107f1bd7d37fe4b171ee2259af60;hp=6cf4adb90f80c0df53ff686e5da0e42d04c0ae31;hpb=e516e78510ad455eebc0e06645c9f12943117525;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 6cf4adb..f802031 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -18,6 +18,7 @@ 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 &)
@@ -26,13 +27,8 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 		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");
-	}
+	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);
@@ -53,9 +49,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);