X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchive.cpp;h=4dee50899f123ad580b5f3f66997527446442fec;hb=654de39b62a9a58fd8e1b5a557361d628345788b;hp=daff2339d56a1ac0d3798c5b10fdfa604e654283;hpb=4fcc283a4bb1f695bd124006906bcdaba053193f;p=builder.git

diff --git a/source/archive.cpp b/source/archive.cpp
index daff233..4dee508 100644
--- a/source/archive.cpp
+++ b/source/archive.cpp
@@ -1,9 +1,16 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include "archive.h"
 #include "builder.h"
 #include "component.h"
 #include "objectfile.h"
-#include "package.h"
+#include "sourcepackage.h"
 #include "staticlibrary.h"
 
 using namespace std;
@@ -14,12 +21,12 @@ Archive::Archive(Builder &b, const StaticLibrary &lib):
 {
 	const Component &comp=lib.get_component();
 
-	argv.push_back("ar");
+	argv.push_back(builder.get_tool("AR", comp.get_package().get_arch()));
 	argv.push_back("rc");
 
 	argv.push_back(lib.get_name());
-	const list<Target *> &deps=lib.get_depends();
-	for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+	const TargetList &deps=lib.get_depends();
+	for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
 		if(dynamic_cast<ObjectFile *>(*i))
 			argv.push_back((*i)->get_name());