X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=4916408e312607e840cfc9314bc3ee8061b6e760;hb=49e4b3da76973a751c08a0e1674736e746bbf6e3;hp=8eab751e7ad405faf49951bff4f763fd003303d6;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 8eab751..4916408 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -30,7 +30,7 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
 			objs.push_back(obj);
 		else
-			throw invalid_argument("GnuLinker::create_target");
+			throw invalid_argument("GnuArchiver::create_target");
 	}
 
 	const Component &comp = objs.front()->get_component();
@@ -42,7 +42,7 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 Task *GnuArchiver::run(const Target &target) const
 {
 	const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
-	const Component &comp = lib.get_component();
+	const Component &comp = *lib.get_component();
 
 	vector<string> argv;
 	argv.push_back("ar");
@@ -52,8 +52,8 @@ Task *GnuArchiver::run(const Target &target) const
 
 	argv.push_back(relative(lib.get_path(), work_dir).str());
 
-	const TargetList &deps = lib.get_depends();
-	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+	const Target::Dependencies &deps = lib.get_depends();
+	for(Target::Dependencies::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 		if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
 			argv.push_back(relative(obj->get_path(), work_dir).str());