Rearrange Target members

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index 6eef8b3268da567f17385307e5c3022825fcd68a..13352870299778b8ba205092e3e742ed008be813 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -7,7 +7,7 @@
 #include "component.h"
 #include "executable.h"
 #include "externaltask.h"
-#include "gnucxxcompiler.h"
+#include "gnucompiler.h"
 #include "gnulinker.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
@@ -17,24 +17,23 @@
 using namespace std;
 using namespace Msp;
 
-GnuLinker::GnuLinker(Builder &b):
-       Tool(b, "LINK")
+GnuLinker::GnuLinker(Builder &b, const Architecture &a):
+       Tool(b, a, "LINK")
 {
        input_suffixes.push_back(".o");
        input_suffixes.push_back(".a");
 
-       const Architecture &arch = builder.get_current_arch();
-       if(arch.is_native())
+       if(architecture->is_native())
        {
                system_path.push_back("/lib");
                system_path.push_back("/usr/lib");
-               if(arch.match_name("pc-32-linux"))
+               if(architecture->match_name("pc-32-linux"))
                        system_path.push_back("/usr/lib/i386-linux-gnu");
-               else if(arch.match_name("pc-64-linux"))
+               else if(architecture->match_name("pc-64-linux"))
                        system_path.push_back("/usr/lib/x86_64-linux-gnu");
        }
        else
-               system_path.push_back("/usr/"+arch.get_cross_prefix()+"/lib");
+               system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib");
 
        default_linker = new Linker(*this, "CC");
        cxx_linker = new Linker(*this, "CXX");
@@ -46,7 +45,7 @@ GnuLinker::~GnuLinker()
        delete cxx_linker;
 }
 
-Target *GnuLinker::create_target(const list<Target *> &sources, const std::string &arg) const
+Target *GnuLinker::create_target(const list<Target *> &sources, const string &arg) const
 {
        if(sources.empty())
                throw invalid_argument("GnuLinker::create_target");
@@ -64,7 +63,7 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const std::strin
                        throw invalid_argument("GnuLinker::create_target");
        }
 
-       const Component &comp = objs.front()->get_component();
+       const Component &comp = *objs.front()->get_component();
        Binary *bin = 0;
        if(arg=="shared")
                bin = new SharedLibrary(builder, comp, objs);
@@ -83,12 +82,22 @@ Task *GnuLinker::run(const Target &) const
 GnuLinker::Linker::Linker(GnuLinker &p, const string &compiler_tag):
        SubTool(p)
 {
-       if(compiler_tag=="CC")
-               command = "gcc";
-       else if(compiler_tag=="CXX")
-               command = "g++";
+       const Tool &compiler = builder.get_toolchain().get_tool(compiler_tag);
+       if(dynamic_cast<const GnuCompiler *>(&compiler))
+               executable = compiler.get_executable();
        else
-               throw invalid_argument("GnuLinker::Linker::Linker");
+       {
+               string command;
+               if(compiler_tag=="CC")
+                       command = "gcc";
+               else if(compiler_tag=="CXX")
+                       command = "g++";
+               else
+                       throw invalid_argument("GnuLinker::Linker::Linker");
+               if(architecture->is_cross())
+                       command = format("%s-%s", architecture->get_cross_prefix(), command);
+               executable = builder.get_vfs().find_binary(command);
+       }
 }
 
 Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const string &arg) const
@@ -101,7 +110,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
        const Binary &bin = dynamic_cast<const Binary &>(target);
 
        vector<string> argv;
-       argv.push_back(command);
+       argv.push_back(executable->get_path().str());
 
        const Component &comp = *bin.get_component();
 
@@ -123,10 +132,9 @@ Task *GnuLinker::Linker::run(const Target &target) const
        if(binfo.threads)
                argv.push_back("-pthread");
 
-       const Architecture &arch = builder.get_current_arch();
        const Architecture &native_arch = builder.get_native_arch();
-       if(arch.get_bits()!=native_arch.get_bits())
-               argv.push_back(format("-m%d", arch.get_bits()));
+       if(architecture->get_bits()!=native_arch.get_bits())
+               argv.push_back(format("-m%d", architecture->get_bits()));
 
        FS::Path work_dir = comp.get_package().get_source();