X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnuarchiver.cpp;h=13b2054ff5f26d2ea9006b3513d17e924b28faf9;hb=f75a99316e896cf1e424a489ce360a67844d86b0;hp=3f56a2ea4e246e701bd4b18ade03104c4d797f3b;hpb=0b16c3de0f9dc01bd8a9708008f9435fe0252df1;p=builder.git

diff --git a/source/gnuarchiver.cpp b/source/gnuarchiver.cpp
index 3f56a2e..13b2054 100644
--- a/source/gnuarchiver.cpp
+++ b/source/gnuarchiver.cpp
@@ -16,6 +16,8 @@ using namespace Msp;
 GnuArchiver::GnuArchiver(Builder &b):
 	Tool(b, "AR")
 {
+	executable = builder.get_vfs().find_binary("ar");
+
 	input_suffixes.push_back(".o");
 }
 
@@ -30,7 +32,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,10 +44,10 @@ 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");
+	argv.push_back(executable->get_path().str());
 	argv.push_back("rc");
 
 	FS::Path work_dir = comp.get_package().get_source();