X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=02708cc9b68d2a2587d92691fa72d788f6e329bd;hb=7ed7c30ee0ceb734f17fe0c6d4bc6d37fb2ab5a7;hp=d2ea51e96c9a3e36387f0f64198aa2c4242443f9;hpb=150d82f46dd34a00cdc59c69c641af2c635239d8;p=builder.git diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index d2ea51e..02708cc 100644 --- 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" @@ -46,7 +49,7 @@ GnuLinker::~GnuLinker() delete cxx_linker; } -Target *GnuLinker::create_target(const list &sources, const string &arg) const +Target *GnuLinker::create_target(const list &sources, const string &arg) { if(sources.empty()) throw invalid_argument("GnuLinker::create_target"); @@ -67,43 +70,61 @@ Target *GnuLinker::create_target(const list &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") + { + Tool &dlltool = builder.get_toolchain().get_tool("DLL"); + dlltool.create_target(*shlib); + } + 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(&target)) + { + Tool © = builder.get_toolchain().get_tool("CP"); + InstalledFile *inst_tgt = dynamic_cast(copy.create_target(target)); + if(architecture->get_system()=="windows") + builder.get_build_graph().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"); } -GnuLinker::Linker::Linker(GnuLinker &p, const string &compiler_tag): - SubTool(p) +GnuLinker::Linker::Linker(GnuLinker &p, const string &ct): + SubTool(p), + compiler_tag(ct) +{ } + +Target *GnuLinker::Linker::create_target(const list &sources, const string &arg) { - const Tool &compiler = builder.get_toolchain().get_tool(compiler_tag); - if(dynamic_cast(&compiler)) - executable = compiler.get_executable(); - else - { - string command; - if(compiler_tag=="CC") - command = "gcc"; - else if(compiler_tag=="CXX") - command = "g++"; - else - throw invalid_argument("GnuLinker::Linker::Linker"); - if(architecture->is_cross()) - command = format("%s-%s", architecture->get_cross_prefix(), command); - executable = builder.get_vfs().find_binary(command); - } + return parent.create_target(sources, arg); } -Target *GnuLinker::Linker::create_target(const list &sources, const string &arg) const +Target *GnuLinker::Linker::create_install(Target &target) const { - return parent.create_target(sources, arg); + return parent.create_install(target); } string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const @@ -121,6 +142,28 @@ string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const return result; } +void GnuLinker::Linker::do_prepare() +{ + Tool &compiler = builder.get_toolchain().get_tool(compiler_tag); + if(dynamic_cast(&compiler)) + { + compiler.prepare(); + executable = compiler.get_executable(); + } + else + { + string command; + if(compiler_tag=="CC") + command = "gcc"; + else if(compiler_tag=="CXX") + command = "g++"; + else + throw invalid_argument("GnuLinker::Linker::Linker"); + + set_executable(command, true); + } +} + Task *GnuLinker::Linker::run(const Target &target) const { const Binary &bin = dynamic_cast(target); @@ -130,11 +173,13 @@ 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(&bin)) { argv.push_back("-shared"); argv.push_back("-fPIC"); - if(!shlib->get_soname().empty()) + if(architecture->get_system()!="windows" && !shlib->get_soname().empty()) argv.push_back("-Wl,-soname,"+shlib->get_soname()); } @@ -150,8 +195,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()); @@ -160,17 +203,27 @@ Task *GnuLinker::Linker::run(const Target &target) const const Target::Dependencies &depends = target.get_dependencies(); for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i) { + FileTarget *file = dynamic_cast(*i); Target *tgt = (*i)->get_real_target(); if(ObjectFile *obj = dynamic_cast(tgt)) argv.push_back(relative(obj->get_path(), work_dir).str()); else if(StaticLibrary *stlib = dynamic_cast(tgt)) - argv.push_back(stlib->get_path().str()); + argv.push_back((file?file:stlib)->get_path().str()); else if(SharedLibrary *shlib = dynamic_cast(tgt)) { argv.push_back("-l"+shlib->get_libname()); static_link_ok = false; } + else if(ImportLibrary *imp = dynamic_cast(tgt)) + { + shlib = imp->get_shared_library(); + if(shlib) + argv.push_back("-l"+shlib->get_libname()); + else + argv.push_back((file?file:imp)->get_path().str()); + static_link_ok = false; + } } if(static_link_ok)