Move architecture information from Builder to class Architecture

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index a7ea2c55df4374fc1149fedc0b4eaf4dc922785b..88ee97a8595e1c5668f2e712b150ae6c895271ac 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -26,8 +26,9 @@ Link::Link(Builder &b, const Executable &exe):
        const Component &comp=exe.get_component();
 
        //XXX Determine whether to use g++ or gcc
-       argv.push_back(builder.get_tool("LDXX", comp.get_package().get_arch()));
-       
+       string tool="LXX";
+       argv.push_back(builder.get_architecture(comp.get_package().get_arch()).get_tool(tool));
+
        if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
                argv.push_back("-shared");
        else if(comp.get_package().get_library_mode()==ALL_STATIC)
@@ -38,7 +39,7 @@ Link::Link(Builder &b, const Executable &exe):
                argv.push_back(*i);
        for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
                argv.push_back("-L"+*i);
-       
+
        argv.push_back("-o");
        argv.push_back(exe.get_name());
        const TargetList &deps=exe.get_depends();
@@ -62,7 +63,7 @@ Link::Link(Builder &b, const Executable &exe):
        if(!builder.get_dry_run())
                Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
 
-       announce(comp.get_package().get_name(), "LINK", relative(epath, comp.get_package().get_source()).str());
+       announce(comp.get_package().get_name(), tool, relative(epath, comp.get_package().get_source()).str());
 
        launch();
 }