Change Tool's protected constructor to take a pointer to Architecture

[builder.git] / source / msvcarchiver.cpp

diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp
index 4a44bee593f463a94ef4702ee75b2410a611d037..26fbc1d980a81888b45062ddf11ecc164040d9d4 100644 (file)
--- a/source/msvcarchiver.cpp
+++ b/source/msvcarchiver.cpp
@@ -11,20 +11,22 @@ using namespace std;
 using namespace Msp;
 
 MsvcArchiver::MsvcArchiver(Builder &b, const Architecture &a, const MicrosoftTools &m):
-       Tool(b, a, "AR"),
+       Tool(b, &a, "AR"),
        ms_tools(m)
 {
        input_suffixes.push_back(".o");
        processing_unit = COMPONENT;
        set_command((ms_tools.get_vc_bin_dir()/"lib.exe").str(), false);
+       set_run(_run);
 }
 
-Target *MsvcArchiver::create_target(const list<Target *> &sources, const string &)
+Target *MsvcArchiver::create_target(const vector<Target *> &sources, const string &)
 {
        if(sources.empty())
                throw invalid_argument("MsvcArchiver::create_target");
 
-       list<ObjectFile *> objs;
+       vector<ObjectFile *> objs;
+       objs.reserve(sources.size());
        for(Target *s: sources)
                objs.push_back(&dynamic_cast<ObjectFile &>(*s));
 
@@ -34,13 +36,13 @@ Target *MsvcArchiver::create_target(const list<Target *> &sources, const string
        return lib;
 }
 
-Task *MsvcArchiver::run(const Target &target) const
+Task *MsvcArchiver::_run(const StaticLibrary &lib)
 {
-       const StaticLibrary &lib = dynamic_cast<const StaticLibrary &>(target);
        const Component &comp = *lib.get_component();
+       const Tool &tool = *lib.get_tool();
 
        vector<string> argv;
-       argv.push_back(executable->get_path().str());
+       argv.push_back(tool.get_executable()->get_path().str());
        argv.push_back("/NOLOGO");
 
        FS::Path work_dir = comp.get_package().get_source_directory();