Replace per-file copyright notices with a single file

[builder.git] / source / link.cpp

diff --git a/source/link.cpp b/source/link.cpp
index b165bad72550900f75c9e82400a86dd91f0816d7..5cee28753405a5158cdf5abfa6d6fdf69fa00aee 100644 (file)
--- a/source/link.cpp
+++ b/source/link.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include "builder.h"
@@ -24,12 +17,12 @@ using namespace Msp;
 Link::Link(Builder &b, const Binary &bin):
        ExternalAction(b)
 {
-       const Component &comp=bin.get_component();
+       const Component &comp = bin.get_component();
 
-       work_dir=comp.get_package().get_source();
+       work_dir = comp.get_package().get_source();
 
        //XXX Determine whether to use g++ or gcc
-       string tool="LXX";
+       string tool = "LXX";
        argv.push_back(builder.get_current_arch().get_tool(tool));
 
        if(comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE)
@@ -37,7 +30,11 @@ Link::Link(Builder &b, const Binary &bin):
        else if(comp.get_package().get_library_mode()==ALL_STATIC)
                argv.push_back("-static");
 
-       const BuildInfo &binfo=comp.get_build_info();
+       if(const SharedLibrary *lib = dynamic_cast<const SharedLibrary *>(&bin))
+               if(!lib->get_soname().empty())
+                       argv.push_back("-Wl,-soname,"+lib->get_soname());
+
+       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)
@@ -45,26 +42,24 @@ Link::Link(Builder &b, const Binary &bin):
 
        argv.push_back("-o");
        argv.push_back(relative(bin.get_path(), work_dir).str());
-       const TargetList &deps=bin.get_depends();
+       const TargetList &deps = bin.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
-               Target *tgt=*i;
-               if(Install *inst=dynamic_cast<Install *>(tgt))
-                       tgt=&inst->get_source();
+               Target *tgt = (*i)->get_real_target();
 
-               if(ObjectFile *obj=dynamic_cast<ObjectFile *>(tgt))
+               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
                        argv.push_back(relative(obj->get_path(), work_dir).str());
-               else if(StaticLibrary *stlib=dynamic_cast<StaticLibrary *>(tgt))
+               else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
                        argv.push_back(stlib->get_path().str());
-               else if(Library *lib=dynamic_cast<Library *>(tgt))
+               else if(Library *lib = dynamic_cast<Library *>(tgt))
                        argv.push_back("-l"+lib->get_libname());
        }
 
-       FS::Path binpath=bin.get_path();
+       FS::Path binpath = bin.get_path();
        if(!builder.get_dry_run())
                FS::mkpath(FS::dirname(binpath), 0755);
 
-       announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str());
+       announce(comp.get_package().get_name(), tool, relative(binpath, work_dir).str().substr(2));
 
        launch();
 }