Add gcc's private library directory to ClangLinker's system path

[builder.git] / source / msvcarchiver.cpp

diff --git a/source/msvcarchiver.cpp b/source/msvcarchiver.cpp
index 5544b2768532bc1f74b9499f0256e1e5139bb431..d0489cf10bd6cdeac5af213956dbc37cc5e816d2 100644 (file)
--- a/source/msvcarchiver.cpp
+++ b/source/msvcarchiver.cpp
@@ -1,6 +1,5 @@
 #include <msp/fs/utils.h>
 #include "component.h"
-#include "externaltask.h"
 #include "microsofttools.h"
 #include "msvcarchiver.h"
 #include "objectfile.h"
@@ -11,12 +10,13 @@ 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_external(_run);
 }
 
 Target *MsvcArchiver::create_target(const vector<Target *> &sources, const string &)
@@ -35,22 +35,19 @@ Target *MsvcArchiver::create_target(const vector<Target *> &sources, const strin
        return lib;
 }
 
-Task *MsvcArchiver::run(const Target &target) const
+ExternalTask::Arguments MsvcArchiver::_run(const StaticLibrary &lib, FS::Path &work_dir)
 {
-       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();
-
        argv.push_back("/OUT:"+relative(lib.get_path(), work_dir).str());
 
        for(Target *d: lib.get_dependencies())
                if(ObjectFile *obj = dynamic_cast<ObjectFile *>(d))
                        argv.push_back(relative(obj->get_path(), work_dir).str());
 
-       return new ExternalTask(argv, work_dir);
+       return argv;
 }