Don't add a symlink with the same name as the file

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index d2ea51e96c9a3e36387f0f64198aa2c4242443f9..cd40a853cac56ffe8d06295c4bb9c96650e9c7cf 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -7,9 +7,12 @@
 #include "builder.h"
 #include "component.h"
 #include "executable.h"
+#include "exportdefinitions.h"
 #include "externaltask.h"
 #include "gnucompiler.h"
 #include "gnulinker.h"
+#include "importlibrary.h"
+#include "installedfile.h"
 #include "objectfile.h"
 #include "sharedlibrary.h"
 #include "sourcepackage.h"
@@ -67,13 +70,45 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
        const Component &comp = *objs.front()->get_component();
        Binary *bin = 0;
        if(arg=="shared")
-               bin = new SharedLibrary(builder, comp, objs);
+       {
+               SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
+               if(architecture->get_system()=="windows")
+               {
+                       ExportDefinitions *exp = new ExportDefinitions(builder, comp, *shlib);
+                       shlib->add_side_effect(*exp);
+                       const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
+                       ImportLibrary *imp = dynamic_cast<ImportLibrary *>(dlltool.create_target(*exp));
+                       shlib->set_import_library(imp);
+               }
+               bin = shlib;
+       }
        else
                bin = new Executable(builder, comp, objs);
        bin->set_tool(*linker);
        return bin;
 }
 
+Target *GnuLinker::create_install(Target &target) const
+{
+       if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(&target))
+       {
+               const Tool &copy = builder.get_toolchain().get_tool("CP");
+               InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
+               if(architecture->get_system()=="windows")
+                       builder.add_installed_target(*shlib->get_import_library());
+               else
+               {
+                       const Pattern &pattern = architecture->get_shared_library_patterns().front();
+                       string link_name = pattern.apply(shlib->get_libname());
+                       if(link_name!=FS::basename(inst_tgt->get_path()))
+                               inst_tgt->set_symlink(link_name);
+               }
+               return inst_tgt;
+       }
+       else
+               return 0;
+}
+
 Task *GnuLinker::run(const Target &) const
 {
        throw logic_error("GnuLinker should not be run directly");
@@ -106,6 +141,11 @@ Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const st
        return parent.create_target(sources, arg);
 }
 
+Target *GnuLinker::Linker::create_install(Target &target) const
+{
+       return parent.create_install(target);
+}
+
 string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
 {
        string result = FS::basename(executable->get_path());
@@ -130,11 +170,19 @@ Task *GnuLinker::Linker::run(const Target &target) const
 
        const Component &comp = *bin.get_component();
 
+       FS::Path work_dir = comp.get_package().get_source_directory();
+
        if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
        {
                argv.push_back("-shared");
                argv.push_back("-fPIC");
-               if(!shlib->get_soname().empty())
+               const Target::Dependencies &side_eff = target.get_side_effects();
+               for(Target::Dependencies::const_iterator i=side_eff.begin(); i!=side_eff.end(); ++i)
+               {
+                       if(ExportDefinitions *exp = dynamic_cast<ExportDefinitions *>(*i))
+                               argv.push_back("-Wl,--output-def,"+relative(exp->get_path(), work_dir).str());
+               }
+               if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
                        argv.push_back("-Wl,-soname,"+shlib->get_soname());
        }
 
@@ -150,8 +198,6 @@ Task *GnuLinker::Linker::run(const Target &target) const
        if(architecture->get_bits()!=native_arch.get_bits())
                argv.push_back(format("-m%d", architecture->get_bits()));
 
-       FS::Path work_dir = comp.get_package().get_source_directory();
-
        argv.push_back("-o");
        argv.push_back(relative(bin.get_path(), work_dir).str());
 
@@ -171,6 +217,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
                        argv.push_back("-l"+shlib->get_libname());
                        static_link_ok = false;
                }
+               else if(ImportLibrary *imp = dynamic_cast<ImportLibrary *>(tgt))
+               {
+                       shlib = imp->get_shared_library();
+                       if(shlib)
+                               argv.push_back("-l"+shlib->get_libname());
+                       else
+                               argv.push_back(imp->get_path().str());
+                       static_link_ok = false;
+               }
        }
 
        if(static_link_ok)