Include libmode in library lookup hash

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index 4a96ff2e4da59b2bde1f1173584d863890f5b09a..f775158cea53d73ab9b9f676b49b77f4f59fe0cb 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "component.h"
@@ -18,11 +25,12 @@ 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());
+       work_dir=comp.get_package().get_source();
 
        //XXX Determine whether to use g++ or gcc
-       argv.push_back(prefix+"g++");
-       
+       string tool="LXX";
+       argv.push_back(builder.get_current_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)
@@ -33,9 +41,9 @@ 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());
+       argv.push_back(relative(exe.get_name(), work_dir).str());
        const TargetList &deps=exe.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
@@ -44,7 +52,7 @@ Link::Link(Builder &b, const Executable &exe):
                        tgt=tgt->get_depends().front();
 
                if(dynamic_cast<ObjectFile *>(tgt))
-                       argv.push_back((*i)->get_name());
+                       argv.push_back(relative((*i)->get_name(), work_dir).str());
                else if(SharedLibrary *shlib=dynamic_cast<SharedLibrary *>(tgt))
                        argv.push_back("-l"+shlib->get_libname());
                else if(dynamic_cast<StaticLibrary *>(tgt))
@@ -53,11 +61,11 @@ Link::Link(Builder &b, const Executable &exe):
                        argv.push_back("-l"+syslib->get_libname());
        }
 
-       Path::Path epath=exe.get_name();
+       Path epath=exe.get_name();
        if(!builder.get_dry_run())
-               Path::mkpath(epath.subpath(0, epath.size()-1), 0755);
+               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, work_dir).str());
 
        launch();
 }