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

diff --git a/source/archive.cpp b/source/archive.cpp
index 7da7250..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,9 +21,7 @@ Archive::Archive(Builder &b, const StaticLibrary &lib):
 {
 	const Component &comp=lib.get_component();
 
-	const string &prefix=b.get_arch_prefix(lib.get_package()->get_arch());
-
-	argv.push_back(prefix+"ar");
+	argv.push_back(builder.get_tool("AR", comp.get_package().get_arch()));
 	argv.push_back("rc");
 
 	argv.push_back(lib.get_name());