X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=6cf4adb90f80c0df53ff686e5da0e42d04c0ae31;hb=df88e22a258f169b9505acb0cb8d0ba7e66af7b6;hp=71edc42d57d26d09560c9ddc1b389e0febcedae9;hpb=2aaad259f2dff58c1e909f1e6d83961e78fd7d3e;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 71edc42..6cf4adb 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -1,7 +1,6 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
-#include <msp/strings/format.h>
 #include <stdexcept>
 #include "builder.h"
 #include "component.h"
@@ -17,15 +16,11 @@ using namespace Msp;
 GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
 	Tool(b, a, "AR")
 {
-	string command = "ar";
-	if(architecture->is_cross())
-		command = format("%s-%s", architecture->get_cross_prefix(), command);
-	executable = builder.get_vfs().find_binary(command);
-
+	set_command("ar", true);
 	input_suffixes.push_back(".o");
 }
 
-Target *GnuArchiver::create_target(const list<Target *> &sources, const string &) const
+Target *GnuArchiver::create_target(const list<Target *> &sources, const string &)
 {
 	if(sources.empty())
 		throw invalid_argument("GnuArchiver::create_target");
@@ -54,21 +49,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);
 }