Add basic support for tools (not configurable yet)

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index 2ff5a97e85060545194ab58b4832e219617bb542..2f688be4cbd73fb1788348a717de1df52bcdeb3c 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -18,12 +18,10 @@ Link::Link(Builder &b, const Executable &exe):
 {
        const Component &comp=exe.get_component();
 
-       const string &prefix=b.get_arch_prefix(exe.get_package()->get_arch());
-
        //XXX Determine whether to use g++ or gcc
-       argv.push_back(prefix+"g++");
+       argv.push_back(builder.get_tool("LDXX", exe.get_package()->get_arch()));
        
-       if(comp.get_type()==Component::LIBRARY)
+       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)
                argv.push_back("-static");