X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=72c8b07a423a08bacc1e2238fc9354ba70a10230;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=adc3efcfcf6ad72d933b8e401836cbd935e34091;hpb=74dddb20753ad9f4addc54597674041d5fc40412;p=builder.git diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index adc3efc..72c8b07 100644 --- a/source/gnulinker.cpp +++ b/source/gnulinker.cpp @@ -21,7 +21,7 @@ using namespace std; using namespace Msp; -GnuLinker::GnuLinker(Builder &b, const Architecture &a, const FS::Path &sysroot): +GnuLinker::GnuLinker(Builder &b, const Architecture &a): Tool(b, a, "LINK") { input_suffixes.push_back(".o"); @@ -29,9 +29,6 @@ GnuLinker::GnuLinker(Builder &b, const Architecture &a, const FS::Path &sysroot) processing_unit = COMPONENT; - if(!sysroot.empty()) - build_info.sysroot = sysroot; - default_linker = new Linker(*this, "CC"); cxx_linker = new Linker(*this, "CXX"); } @@ -42,22 +39,19 @@ GnuLinker::~GnuLinker() delete cxx_linker; } -Target *GnuLinker::create_target(const list &sources, const string &arg) +Target *GnuLinker::create_target(const vector &sources, const string &arg) { if(sources.empty()) throw invalid_argument("GnuLinker::create_target"); - list objs; + vector objs; + objs.reserve(sources.size()); Linker *linker = default_linker; - for(list::const_iterator i=sources.begin(); i!=sources.end(); ++i) + for(Target *s: sources) { - if(ObjectFile *obj = dynamic_cast(*i)) - { - objs.push_back(obj); - if(obj->get_tool()->get_tag()=="CXX") - linker = cxx_linker; - } - else - throw invalid_argument("GnuLinker::create_target"); + ObjectFile &obj = dynamic_cast(*s); + objs.push_back(&obj); + if(obj.get_tool()->get_tag()=="CXX") + linker = cxx_linker; } const Component &comp = *objs.front()->get_component(); @@ -88,8 +82,7 @@ Target *GnuLinker::create_install(Target &target) const 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()); + string link_name = architecture->create_filename(shlib->get_libname()); if(link_name!=FS::basename(inst_tgt->get_path())) inst_tgt->set_symlink(link_name); } @@ -178,7 +171,7 @@ void GnuLinker::do_prepare() } } else - system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib"); + system_path.push_back(format("/usr/%s/lib", architecture->get_cross_prefix())); } } @@ -202,7 +195,7 @@ GnuLinker::Linker::Linker(GnuLinker &p, const string &ct): string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const { - string result = FS::basename(executable->get_path()); + string result = Tool::create_build_signature(binfo); result += ','; if(binfo.libmode<=BuildInfo::STATIC) result += 't'; @@ -220,6 +213,10 @@ string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const void GnuLinker::Linker::do_prepare() { + parent.prepare(); + build_info = parent.get_build_info(); + system_path = parent.get_system_path(); + Tool &compiler = builder.get_toolchain().get_tool(compiler_tag); if(dynamic_cast(&compiler)) { @@ -232,7 +229,7 @@ Task *GnuLinker::Linker::run(const Target &target) const { const Binary &bin = dynamic_cast(target); - vector argv; + ExternalTask::Arguments argv; argv.push_back(executable->get_path().str()); FS::Path work_dir = bin.get_component()->get_package().get_source_directory(); @@ -270,8 +267,18 @@ Task *GnuLinker::Linker::run(const Target &target) const if(!sysroot.empty()) argv.push_back("--sysroot="+sysroot.str()); - for(BuildInfo::PathList::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i) - argv.push_back("-L"+i->str()); + FS::Path lib_dir = builder.get_prefix()/"lib"; + if(binfo.rpath_mode==BuildInfo::ABSOLUTE) + argv.push_back("-Wl,-rpath,"+lib_dir.str()); + else + { + if(binfo.rpath_mode==BuildInfo::RELATIVE) + argv.push_back("-Wl,-rpath,$ORIGIN/../lib"); + argv.push_back("-Wl,-rpath-link,"+lib_dir.str()); + } + + for(const FS::Path &p: binfo.libpath) + argv.push_back("-L"+p.str()); if(binfo.strip) argv.push_back("-s"); if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin") @@ -284,19 +291,15 @@ Task *GnuLinker::Linker::run(const Target &target) const argv.push_back("-o"); argv.push_back(relative(bin.get_path(), work_dir).str()); - for(BuildInfo::WordList::const_iterator i=binfo.keep_symbols.begin(); i!=binfo.keep_symbols.end(); ++i) - argv.push_back("-u"+*i); + for(const string &s: binfo.keep_symbols) + argv.push_back("-u"+s); bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC); - if(architecture->get_system()=="windows" && architecture->get_cross_prefix().find("mingw")!=string::npos) - argv.push_back("-lmingw32"); - - const Target::Dependencies &depends = target.get_dependencies(); - for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i) + for(Target *d: target.get_dependencies()) { - FileTarget *file = dynamic_cast(*i); - Target *tgt = (*i)->get_real_target(); + FileTarget *file = dynamic_cast(d); + Target *tgt = d->get_real_target(); if(ObjectFile *obj = dynamic_cast(tgt)) argv.push_back(relative(obj->get_path(), work_dir).str()); @@ -318,17 +321,27 @@ Task *GnuLinker::Linker::run(const Target &target) const } } - 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")) + for(const string &l: binfo.libs) + if(l.size()>10 && !l.compare(l.size()-10, 10, ".framework")) { argv.push_back("-framework"); - argv.push_back(i->substr(0, i->size()-10)); + argv.push_back(l.substr(0, l.size()-10)); } if(static_link_ok) argv.push_back("-static"); - else if(architecture->get_system()=="windows") - argv.push_back("-Wl,--enable-auto-import"); + else + { + if(compiler_tag=="CXX") + { + auto i = binfo.libmodes.find("stdc++"); + if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC) + argv.push_back("-static-libstdc++"); + } + + if(architecture->get_system()=="windows") + argv.push_back("-Wl,--enable-auto-import"); + } return new ExternalTask(argv, work_dir); }