Redesign how tools are run

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 56becc2c42ef0f6f9f32f30f7ba910213a077212..31440976e917d31a43c8d9d701ff057a0573a740 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -175,11 +175,6 @@ void GnuLinker::do_prepare()
        }
 }
 
-Task *GnuLinker::run(const Target &) const
-{
-       throw logic_error("GnuLinker should not be run directly");
-}
-
 
 GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
        SubTool(p),
@@ -191,6 +186,8 @@ GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
                set_command("g++", true);
        else
                throw invalid_argument("GnuLinker::Linker::Linker");
+
+       set_run(_run);
 }
 
 string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
@@ -225,12 +222,14 @@ void GnuLinker::Linker::do_prepare()
        }
 }
 
-Task *GnuLinker::Linker::run(const Target &target) const
+Task *GnuLinker::Linker::_run(const Binary &bin)
 {
-       const Binary &bin = dynamic_cast<const Binary &>(target);
+       const Linker &tool = dynamic_cast<const Linker &>(*bin.get_tool());
+       const Builder &builder = tool.get_builder();
+       const Architecture &arch = *tool.get_architecture();
 
        ExternalTask::Arguments argv;
-       argv.push_back(executable->get_path().str());
+       argv.push_back(tool.get_executable()->get_path().str());
 
        FS::Path work_dir = bin.get_component()->get_package().get_source_directory();
 
@@ -238,9 +237,9 @@ Task *GnuLinker::Linker::run(const Target &target) const
        {
                argv.push_back("-shared");
                argv.push_back("-fPIC");
-               if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
+               if(arch.get_system()!="windows" && !shlib->get_soname().empty())
                {
-                       if(architecture->get_system()=="darwin")
+                       if(arch.get_system()=="darwin")
                        {
                                argv.push_back("-install_name");
                                argv.push_back(shlib->get_soname());
@@ -261,7 +260,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
        }
 
        BuildInfo binfo;
-       target.collect_build_info(binfo);
+       bin.collect_build_info(binfo);
 
        const FS::Path &sysroot = binfo.sysroot;
        if(!sysroot.empty())
@@ -281,12 +280,12 @@ Task *GnuLinker::Linker::run(const Target &target) const
                argv.push_back("-L"+p.str());
        if(binfo.strip)
                argv.push_back("-s");
-       if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin")
+       if(binfo.threads && arch.get_system()!="windows" && arch.get_system()!="darwin")
                argv.push_back("-pthread");
 
        const Architecture &native_arch = builder.get_native_arch();
-       if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
-               argv.push_back(format("-m%d", architecture->get_bits()));
+       if(arch.is_native() && arch.get_bits()!=native_arch.get_bits())
+               argv.push_back(format("-m%d", arch.get_bits()));
 
        argv.push_back("-o");
        argv.push_back(relative(bin.get_path(), work_dir).str());
@@ -296,7 +295,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
 
        bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
 
-       for(Target *d: target.get_dependencies())
+       for(Target *d: bin.get_dependencies())
        {
                FileTarget *file = dynamic_cast<FileTarget *>(d);
                Target *tgt = d->get_real_target();
@@ -332,14 +331,14 @@ Task *GnuLinker::Linker::run(const Target &target) const
                argv.push_back("-static");
        else
        {
-               if(compiler_tag=="CXX")
+               if(tool.compiler_tag=="CXX")
                {
                        auto i = binfo.libmodes.find("stdc++");
                        if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC)
                                argv.push_back("-static-libstdc++");
                }
 
-               if(architecture->get_system()=="windows")
+               if(arch.get_system()=="windows")
                        argv.push_back("-Wl,--enable-auto-import");
        }