]> git.tdb.fi Git - builder.git/blobdiff - source/gnulinker.cpp
Redesign GnuLinker to work without subtools
[builder.git] / source / gnulinker.cpp
index 2ec4c048d613372205f0a48421c2dcc24d19eff4..619c9e784b3a00ec5bd22e2e537afb90da9e85d9 100644 (file)
 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");
        input_suffixes.push_back(".a");
 
-       if(!sysroot.empty())
-       {
-               build_info.sysroot = sysroot;
-               system_path.push_back(sysroot/"usr"/"lib");
-       }
-       else 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");
-}
+       processing_unit = COMPONENT;
 
-GnuLinker::~GnuLinker()
-{
-       delete default_linker;
-       delete cxx_linker;
+       set_command("gcc");
+       set_run(_run);
 }
 
-Target *GnuLinker::create_target(const list<Target *> &sources, const string &arg)
+Target *GnuLinker::create_target(const vector<Target *> &sources, const string &arg)
 {
        if(sources.empty())
                throw invalid_argument("GnuLinker::create_target");
-       list<ObjectFile *> objs;
-       Linker *linker = default_linker;
-       for(list<Target *>::const_iterator i=sources.begin(); i!=sources.end(); ++i)
-       {
-               if(ObjectFile *obj = dynamic_cast<ObjectFile *>(*i))
-               {
-                       objs.push_back(obj);
-                       if(obj->get_tool()->get_tag()=="CXX")
-                               linker = cxx_linker;
-               }
-               else
-                       throw invalid_argument("GnuLinker::create_target");
-       }
+       vector<ObjectFile *> objs;
+       objs.reserve(sources.size());
+       for(Target *s: sources)
+               objs.push_back(&dynamic_cast<ObjectFile &>(*s));
 
        const Component &comp = *objs.front()->get_component();
        Binary *bin = 0;
@@ -86,7 +56,7 @@ Target *GnuLinker::create_target(const list<Target *> &sources, const string &ar
        }
        else
                bin = new Executable(builder, comp, objs);
-       bin->set_tool(*linker);
+       bin->set_tool(*this);
        return bin;
 }
 
@@ -100,8 +70,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<SharedLibrary>(shlib->get_libname());
                        if(link_name!=FS::basename(inst_tgt->get_path()))
                                inst_tgt->set_symlink(link_name);
                }
@@ -111,37 +80,9 @@ Target *GnuLinker::create_install(Target &target) const
                return 0;
 }
 
-Task *GnuLinker::run(const Target &) const
+string GnuLinker::create_build_signature(const BuildInfo &binfo) const
 {
-       throw logic_error("GnuLinker should not be run directly");
-}
-
-
-GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
-       SubTool(p),
-       compiler_tag(ct)
-{
-       if(compiler_tag=="CC")
-               set_command("gcc", true);
-       else if(compiler_tag=="CXX")
-               set_command("g++", true);
-       else
-               throw invalid_argument("GnuLinker::Linker::Linker");
-}
-
-Target *GnuLinker::Linker::create_target(const list<Target *> &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());
+       string result = Tool::create_build_signature(binfo);
        result += ',';
        if(binfo.libmode<=BuildInfo::STATIC)
                result += 't';
@@ -157,22 +98,91 @@ string GnuLinker::Linker::create_build_signature(const BuildInfo &binfo) const
        return result;
 }
 
-void GnuLinker::Linker::do_prepare()
+void GnuLinker::do_prepare()
 {
-       Tool &compiler = builder.get_toolchain().get_tool(compiler_tag);
-       if(dynamic_cast<GnuCompiler *>(&compiler))
+       bool path_found = false;
+       const FS::Path &sysroot = build_info.sysroot;
+
+       if(executable)
+       {
+               ExternalTask::Arguments argv;
+               argv.push_back(executable->get_path().str());
+               argv.push_back("-Wl,--verbose");
+               argv.push_back("-nostdlib");
+               if(!sysroot.empty())
+                       argv.push_back("--sysroot="+sysroot.str());
+
+               builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
+               try
+               {
+                       string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
+                       string::size_type start = 0;
+                       while(start<output.size())
+                       {
+                               string::size_type search_dir = output.find("SEARCH_DIR(\"", start);
+                               if(search_dir==string::npos)
+                                       break;
+
+                               search_dir += 12;
+                               string::size_type end = output.find("\");", search_dir);
+                               if(end==string::npos)
+                                       break;
+
+                               FS::Path path;
+                               if(!output.compare(search_dir, 2, "=/"))
+                               {
+                                       search_dir += 2;
+                                       if(sysroot.empty())
+                                               path = "/";
+                                       else
+                                               path = sysroot;
+                               }
+
+                               path /= output.substr(search_dir, end-search_dir);
+                               builder.get_logger().log("tools", "Got %s system path: %s", tag, path);
+                               system_path.push_back(path);
+                               path_found = true;
+
+                               start = end+3;
+                       }
+               }
+               catch(...)
+               { }
+       }
+
+       if(!path_found)
        {
-               compiler.prepare();
-               executable = compiler.get_executable();
+               builder.get_logger().log("tools", "No %s system path found, using defaults", tag);
+               if(!sysroot.empty())
+                       system_path.push_back(sysroot/"usr/lib");
+               else 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("/lib/i386-linux-gnu");
+                               system_path.push_back("/usr/lib/i386-linux-gnu");
+                       }
+                       else if(architecture->match_name("pc-64-linux"))
+                       {
+                               system_path.push_back("/lib/x86_64-linux-gnu");
+                               system_path.push_back("/usr/lib/x86_64-linux-gnu");
+                       }
+               }
+               else
+                       system_path.push_back(format("/usr/%s/lib", architecture->get_cross_prefix()));
        }
 }
 
-Task *GnuLinker::Linker::run(const Target &target) const
+Task *GnuLinker::_run(const Binary &bin)
 {
-       const Binary &bin = dynamic_cast<const Binary &>(target);
+       const Tool &tool = *bin.get_tool();
+       const Builder &builder = tool.get_builder();
+       const Architecture &arch = *tool.get_architecture();
 
-       vector<string> argv;
-       argv.push_back(executable->get_path().str());
+       ExternalTask::Arguments argv;
+       argv.push_back(tool.get_executable()->get_path().str());
 
        FS::Path work_dir = bin.get_component()->get_package().get_source_directory();
 
@@ -180,9 +190,9 @@ Task *GnuLinker::Linker::run(const Target &target) const
        {
                argv.push_back("-shared");
                argv.push_back("-fPIC");
-               if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
+               if(arch.get_system()!="windows" && !shlib->get_soname().empty())
                {
-                       if(architecture->get_system()=="darwin")
+                       if(arch.get_system()=="darwin")
                        {
                                argv.push_back("-install_name");
                                argv.push_back(shlib->get_soname());
@@ -203,36 +213,53 @@ Task *GnuLinker::Linker::run(const Target &target) const
        }
 
        BuildInfo binfo;
-       target.collect_build_info(binfo);
+       bin.collect_build_info(binfo);
 
        const FS::Path &sysroot = binfo.sysroot;
        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")
+       if(binfo.threads && arch.get_system()!="windows" && arch.get_system()!="darwin")
                argv.push_back("-pthread");
 
        const Architecture &native_arch = builder.get_native_arch();
-       if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
-               argv.push_back(format("-m%d", architecture->get_bits()));
+       if(arch.is_native() && arch.get_bits()!=native_arch.get_bits())
+               argv.push_back(format("-m%d", arch.get_bits()));
 
        argv.push_back("-o");
        argv.push_back(relative(bin.get_path(), work_dir).str());
 
+       for(const string &s: binfo.keep_symbols)
+               argv.push_back("-u"+s);
+
        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)
+       bool has_cplusplus = false;
+       for(Target *d: bin.get_dependencies())
        {
-               FileTarget *file = dynamic_cast<FileTarget *>(*i);
-               Target *tgt = (*i)->get_real_target();
+               FileTarget *file = dynamic_cast<FileTarget *>(d);
+               Target *tgt = d->get_real_target();
 
                if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
+               {
                        argv.push_back(relative(obj->get_path(), work_dir).str());
+                       if(obj->get_tool()->get_tag()=="CXX")
+                               has_cplusplus = true;
+               }
                else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
                        argv.push_back((file?file:stlib)->get_path().str());
                else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
@@ -251,17 +278,30 @@ 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(has_cplusplus)
+               argv.push_back("-lstdc++");
+
        if(static_link_ok)
                argv.push_back("-static");
-       else if(architecture->get_system()=="windows")
-               argv.push_back("-Wl,--enable-auto-import");
+       else
+       {
+               if(has_cplusplus)
+               {
+                       auto i = binfo.libmodes.find("stdc++");
+                       if(i!=binfo.libmodes.end() && i->second<=BuildInfo::STATIC)
+                               argv.push_back("-static-libstdc++");
+               }
+
+               if(arch.get_system()=="windows")
+                       argv.push_back("-Wl,--enable-auto-import");
+       }
 
        return new ExternalTask(argv, work_dir);
 }