X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnulinker.cpp;h=d2ea51e96c9a3e36387f0f64198aa2c4242443f9;hb=0dea0d850f6690de07933794592916d11c9d3f49;hp=ad9de775f3acecf3534cf61b37b6b630fc2574ab;hpb=dc4b917034c9d3718f07139e2f0f3631a080c6f3;p=builder.git diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp index ad9de77..d2ea51e 100644 --- a/source/gnulinker.cpp +++ b/source/gnulinker.cpp @@ -3,11 +3,12 @@ #include #include #include +#include #include "builder.h" #include "component.h" #include "executable.h" #include "externaltask.h" -#include "gnucxxcompiler.h" +#include "gnucompiler.h" #include "gnulinker.h" #include "objectfile.h" #include "sharedlibrary.h" @@ -17,53 +18,115 @@ using namespace std; using namespace Msp; -GnuLinker::GnuLinker(Builder &b): - Tool(b, "LINK") +GnuLinker::GnuLinker(Builder &b, const Architecture &a): + Tool(b, a, "LINK") { input_suffixes.push_back(".o"); input_suffixes.push_back(".a"); + + if(architecture->is_native()) + { + system_path.push_back("/lib"); + system_path.push_back("/usr/lib"); + if(architecture->match_name("pc-32-linux")) + system_path.push_back("/usr/lib/i386-linux-gnu"); + else if(architecture->match_name("pc-64-linux")) + system_path.push_back("/usr/lib/x86_64-linux-gnu"); + } + else + system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/lib"); + + default_linker = new Linker(*this, "CC"); + cxx_linker = new Linker(*this, "CXX"); } -Target *GnuLinker::create_target(const list &sources, const std::string &arg) const +GnuLinker::~GnuLinker() +{ + delete default_linker; + delete cxx_linker; +} + +Target *GnuLinker::create_target(const list &sources, const string &arg) const { if(sources.empty()) throw invalid_argument("GnuLinker::create_target"); list objs; + Linker *linker = default_linker; for(list::const_iterator i=sources.begin(); i!=sources.end(); ++i) { 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"); } - 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); else bin = new Executable(builder, comp, objs); - bin->set_tool(*this); + bin->set_tool(*linker); return bin; } -Task *GnuLinker::run(const Target &target) const +Task *GnuLinker::run(const Target &) const { - const Binary &bin = dynamic_cast(target); + throw logic_error("GnuLinker should not be run directly"); +} - string command = "gcc"; - const Target::Dependencies &depends = target.get_depends(); - for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i) - if(ObjectFile *obj = dynamic_cast(*i)) - { - const Tool *tool = obj->get_tool(); - if(dynamic_cast(tool)) - command = "g++"; - } +GnuLinker::Linker::Linker(GnuLinker &p, const string &compiler_tag): + SubTool(p) +{ + 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); + } +} + +Target *GnuLinker::Linker::create_target(const list &sources, const string &arg) const +{ + return parent.create_target(sources, arg); +} + +string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const +{ + 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; +} + +Task *GnuLinker::Linker::run(const Target &target) const +{ + const Binary &bin = dynamic_cast(target); vector argv; - argv.push_back(command); + argv.push_back(executable->get_path().str()); const Component &comp = *bin.get_component(); @@ -74,26 +137,27 @@ Task *GnuLinker::run(const Target &target) const if(!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(list::const_iterator i=binfo.libpath.begin(); i!=binfo.libpath.end(); ++i) - argv.push_back("-L"+*i); + 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) argv.push_back("-pthread"); - const Architecture &arch = builder.get_current_arch(); const Architecture &native_arch = builder.get_native_arch(); - if(arch.get_bits()!=native_arch.get_bits()) - argv.push_back(format("-m%d", arch.get_bits())); + 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(); + 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); + + const Target::Dependencies &depends = target.get_dependencies(); for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i) { Target *tgt = (*i)->get_real_target(); @@ -103,11 +167,16 @@ Task *GnuLinker::run(const Target &target) const else if(StaticLibrary *stlib = dynamic_cast(tgt)) argv.push_back(stlib->get_path().str()); else if(SharedLibrary *shlib = dynamic_cast(tgt)) + { argv.push_back("-l"+shlib->get_libname()); + 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); }