Move architecture information from Builder to class Architecture

[builder.git] / source / archive.cpp

diff --git a/source/archive.cpp b/source/archive.cpp
index 4dee50899f123ad580b5f3f66997527446442fec..a7b86c7cc4b945769fc82f404ea0f8de61ee799a 100644 (file)
--- a/source/archive.cpp
+++ b/source/archive.cpp
@@ -21,7 +21,8 @@ Archive::Archive(Builder &b, const StaticLibrary &lib):
 {
        const Component &comp=lib.get_component();
 
-       argv.push_back(builder.get_tool("AR", comp.get_package().get_arch()));
+       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());
@@ -34,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();
 }