X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=3499204954593db5587280e5d1679b514f2e2215;hb=fa2beaa15ccc64956b12d6d81d95a11538748327;hp=13b2054ff5f26d2ea9006b3513d17e924b28faf9;hpb=3e8f3a5e852e9dd5b78ec3d89c722ef1bae6bef5;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 13b2054..3499204 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -1,6 +1,7 @@
 #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"
@@ -13,10 +14,13 @@
 using namespace std;
 using namespace Msp;
 
-GnuArchiver::GnuArchiver(Builder &b):
-	Tool(b, "AR")
+GnuArchiver::GnuArchiver(Builder &b, const Architecture &a):
+	Tool(b, a, "AR")
 {
-	executable = builder.get_vfs().find_binary("ar");
+	string command = "ar";
+	if(architecture->is_cross())
+		command = format("%s-%s", architecture->get_cross_prefix(), command);
+	executable = builder.get_vfs().find_binary(command);
 
 	input_suffixes.push_back(".o");
 }
@@ -35,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;
@@ -50,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);
 }