X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=6a2fcd54cdfd17d90f330f53f75b66b5bbe625e8;hb=3f0f721;hp=6ea88718fa4d8c3af4f3c2d91863eabefbe74531;hpb=03227882aef8b448065e6ca9cda9b7722b7a9753;p=builder.git diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index 6ea8871..6a2fcd5 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,45 +70,70 @@ 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) { - const Tool &compiler = builder.get_toolchain().get_tool(compiler_tag); - if(dynamic_cast(&compiler)) - executable = compiler.get_executable(); + if(compiler_tag=="CC") + set_command("gcc", true); + else if(compiler_tag=="CXX") + set_command("g++", true); 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); - } + throw invalid_argument("GnuLinker::Linker::Linker"); } -Target *GnuLinker::Linker::create_target(const list &sources, const string &arg) const +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 { string result = FS::basename(executable->get_path()); @@ -116,11 +144,24 @@ string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const result += 'd'; if(binfo.strip) result += 's'; - result += ",l"; - result += join(binfo.libs.begin(), binfo.libs.end(), ",l"); + if(!binfo.libs.empty()) + { + 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(); + } +} + Task *GnuLinker::Linker::run(const Target &target) const { const Binary &bin = dynamic_cast(target); @@ -130,54 +171,98 @@ 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()) - argv.push_back("-Wl,-soname,"+shlib->get_soname()); + if(architecture->get_system()!="windows" && !shlib->get_soname().empty()) + { + if(architecture->get_system()=="darwin") + { + argv.push_back("-install_name"); + argv.push_back(shlib->get_soname()); + + const string &ver = shlib->get_package()->get_version(); + const string &if_ver = shlib->get_package()->get_interface_version(); + if(!ver.empty() && !if_ver.empty()) + { + argv.push_back("-current_version"); + argv.push_back(ver); + argv.push_back("-compatibility_version"); + argv.push_back(if_ver); + } + } + else + argv.push_back("-Wl,-soname,"+shlib->get_soname()); + } } - const BuildInfo &binfo = comp.get_build_info(); + BuildInfo binfo; + target.collect_build_info(binfo); for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i) argv.push_back("-L"+i->str()); if(binfo.strip) argv.push_back("-s"); - if(binfo.threads) + if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin") argv.push_back("-pthread"); const Architecture &native_arch = builder.get_native_arch(); - if(architecture->get_bits()!=native_arch.get_bits()) + if(architecture->is_native() && 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()); bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC); + bool need_l_objc = false; 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()); + /* XXX This is a hack. A more generic way is needed for tools to pass + information down the chain. */ + if(obj->get_tool()->get_tag()=="OBJC") + need_l_objc = true; + } 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; + } } + for(BuildInfo::WordList::const_iterator i=binfo.libs.begin(); i!=binfo.libs.end(); ++i) + if(i->size()>10 && !i->compare(i->size()-10, 10, ".framework")) + { + argv.push_back("-framework"); + argv.push_back(i->substr(0, i->size()-10)); + } + + if(need_l_objc) + argv.push_back("-lobjc"); if(static_link_ok) argv.push_back("-static"); - - if(!builder.get_dry_run()) - FS::mkpath(FS::dirname(bin.get_path()), 0755); + else if(architecture->get_system()=="windows") + argv.push_back("-Wl,--enable-auto-import"); return new ExternalTask(argv, work_dir); }