X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=3499204954593db5587280e5d1679b514f2e2215;hb=483add89e7f305642cc88a5f63a7741a15b6290e;hp=3f96cbfd9a94135d6c7c6348b3f91b53e358b3a0;hpb=25a315f3cb5805614c513ac762ea1bd512ce82cb;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 3f96cbf..3499204 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -39,7 +39,7 @@ Target *GnuArchiver::create_target(const list<Target *> &sources, const string &
 			throw invalid_argument("GnuArchiver::create_target");
 	}
 
-	const Component &comp = objs.front()->get_component();
+	const Component &comp = *objs.front()->get_component();
 	StaticLibrary *lib = new StaticLibrary(builder, comp, objs);
 	lib->set_tool(*this);
 	return lib;
@@ -54,21 +54,14 @@ Task *GnuArchiver::run(const Target &target) const
 	argv.push_back(executable->get_path().str());
 	argv.push_back("rc");
 
-	FS::Path work_dir = comp.get_package().get_source();
+	FS::Path work_dir = comp.get_package().get_source_directory();
 
 	argv.push_back(relative(lib.get_path(), work_dir).str());
 
-	const Target::Dependencies &deps = lib.get_depends();
+	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))
 			argv.push_back(relative(obj->get_path(), work_dir).str());
 
-	if(!builder.get_dry_run())
-	{
-		FS::mkpath(FS::dirname(lib.get_path()), 0755);
-		if(FS::exists(lib.get_path()))
-			FS::unlink(lib.get_path());
-	}
-
 	return new ExternalTask(argv, work_dir);
 }