Move architecture information from Builder to class Architecture

[builder.git] / source / archive.cpp

diff --git a/source/archive.cpp b/source/archive.cpp
index 7da7250f1d47c0beba22051221d93ffc9d1744cb..a7b86c7cc4b945769fc82f404ea0f8de61ee799a 100644 (file)
--- 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,8 @@ 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");
+       std::string tool="AR";
+       argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
        argv.push_back("rc");
 
        argv.push_back(lib.get_name());
@@ -29,7 +35,7 @@ Archive::Archive(Builder &b, const StaticLibrary &lib):
        if(!builder.get_dry_run())
                Path::mkpath(lpath.subpath(0, lpath.size()-1), 0755);
 
-       announce(comp.get_package().get_name(), "AR  ", relative(lpath, comp.get_package().get_source()).str());
+       announce(comp.get_package().get_name(), tool, relative(lpath, comp.get_package().get_source()).str());
 
        launch();
 }