X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=dc0b78494c90f4293ba3fa50379cbf12a2a3d479;hb=edd4771292a2273080fbcbac266c6831834b0b86;hp=2f5ba24d6068d7c3f9c5d695b502a87d955f3d5c;hpb=1ed833343bc83b83c5f61cbfd74423bbba677a04;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 2f5ba24..dc0b784 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -4,7 +4,6 @@
 #include <stdexcept>
 #include "builder.h"
 #include "component.h"
-#include "externaltask.h"
 #include "gnuarchiver.h"
 #include "objectfile.h"
 #include "sourcepackage.h"
@@ -14,12 +13,12 @@ using namespace std;
 using namespace Msp;
 
 GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
-	Tool(b, a, "AR")
+	Tool(b, &a, "AR")
 {
 	set_command("ar", true);
 	input_suffixes.push_back(".o");
 	processing_unit = COMPONENT;
-	set_run(_run);
+	set_run_external(_run);
 }
 
 Target *GnuArchiver::create_target(const vector<Target *> &sources, const string &)
@@ -38,22 +37,19 @@ Target *GnuArchiver::create_target(const vector<Target *> &sources, const string
 	return lib;
 }
 
-Task *GnuArchiver::_run(const StaticLibrary &lib)
+ExternalTask::Arguments GnuArchiver::_run(const StaticLibrary &lib, FS::Path &work_dir)
 {
 	const Tool &tool = *lib.get_tool();
-	const Component &comp = *lib.get_component();
 
 	vector<string> argv;
 	argv.push_back(tool.get_executable()->get_path().str());
 	argv.push_back("rc");
 
-	FS::Path work_dir = comp.get_package().get_source_directory();
-
 	argv.push_back(relative(lib.get_path(), work_dir).str());
 
 	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);
+	return argv;
 }