X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=cfdee8daffc3570e572006d85093733bbe35c75f;hb=9e28243c9687608ec3c32954b4031490296ae877;hp=719780bb0441c0cc65e8c02f49ee300666cd1c20;hpb=25a315f3cb5805614c513ac762ea1bd512ce82cb;p=builder.git diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index 719780b..cfdee8d 100644 --- a/source/gnulinker.cpp +++ b/source/gnulinker.cpp @@ -3,12 +3,16 @@ #include #include #include +#include #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" @@ -45,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"); @@ -63,28 +67,89 @@ Target *GnuLinker::create_target(const list &sources, const string &ar throw invalid_argument("GnuLinker::create_target"); } - const Component &comp = objs.front()->get_component(); + 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) +{ + 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 { - const Tool &compiler = builder.get_toolchain().get_tool(compiler_tag); - if(dynamic_cast(&compiler)) + string result = FS::basename(executable->get_path()); + result += ','; + if(binfo.libmode<=BuildInfo::STATIC) + result += 't'; + else + result += 'd'; + if(binfo.strip) + result += 's'; + result += ",l"; + result += join(binfo.libs.begin(), binfo.libs.end(), ",l"); + 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; @@ -100,11 +165,6 @@ GnuLinker::Linker::Linker(GnuLinker &p, const string &compiler_tag): } } -Target *GnuLinker::Linker::create_target(const list &sources, const string &arg) const -{ - return parent.create_target(sources, arg); -} - Task *GnuLinker::Linker::run(const Target &target) const { const Binary &bin = dynamic_cast(target); @@ -114,15 +174,15 @@ 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()); } - else if(comp.get_package().get_library_mode()==ALL_STATIC) - argv.push_back("-static"); const BuildInfo &binfo = comp.get_build_info(); for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i) @@ -136,26 +196,41 @@ 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(); - argv.push_back("-o"); argv.push_back(relative(bin.get_path(), work_dir).str()); - const Target::Dependencies &depends = target.get_depends(); + bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC); + + 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(!builder.get_dry_run()) - FS::mkpath(FS::dirname(bin.get_path()), 0755); + if(static_link_ok) + argv.push_back("-static"); + else if(architecture->get_system()=="windows") + argv.push_back("-Wl,--enable-auto-import"); return new ExternalTask(argv, work_dir); }