Include libmode in library lookup hash

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index 96089da8b58116ee24d95b9d57171bca04d0cd8c..f775158cea53d73ab9b9f676b49b77f4f59fe0cb 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,42 +1,71 @@
+/* $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"
 #include "executable.h"
+#include "install.h"
 #include "link.h"
 #include "objectfile.h"
 #include "package.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
+#include "systemlibrary.h"
 
 using namespace std;
 using namespace Msp;
 
-Link::Link(Builder &b, const Executable &exe, const Component &comp):
+Link::Link(Builder &b, const Executable &exe):
        ExternalAction(b)
 {
-       argv.push_back("g++");
-       
-       if(comp.get_type()==Component::LIBRARY)
+       const Component &comp=exe.get_component();
+
+       work_dir=comp.get_package().get_source();
+
+       //XXX Determine whether to use g++ or gcc
+       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)
+               argv.push_back("-static");
 
        const BuildInfo &binfo=comp.get_build_info();
        for(list<string>::const_iterator i=binfo.ldflags.begin(); i!=binfo.ldflags.end(); ++i)
                argv.push_back(*i);
        for(list<string>::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i)
                argv.push_back("-L"+*i);
-       for(list<string>::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i)
-               argv.push_back("-l"+*i);
-       
+
        argv.push_back("-o");
-       argv.push_back(exe.get_name());
-       const list<Target *> &deps=exe.get_depends();
-       for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
-               if(dynamic_cast<ObjectFile *>(*i))
+       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)
+       {
+               Target *tgt=*i;
+               if(dynamic_cast<Install *>(tgt))
+                       tgt=tgt->get_depends().front();
+
+               if(dynamic_cast<ObjectFile *>(tgt))
+                       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))
                        argv.push_back((*i)->get_name());
+               else if(SystemLibrary *syslib=dynamic_cast<SystemLibrary *>(tgt))
+                       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();
 }