Add a list of symbols to keep in the binary to BuildInfo

[builder.git] / source / gnulinker.cpp

diff --git a/source/gnulinker.cpp b/source/gnulinker.cpp
index b2df14cbc9c90e7bff446411654ebf1ce445c7de..75a1bac280609086da046f86e3c71e1cc115d5e5 100644 (file)
--- a/source/gnulinker.cpp
+++ b/source/gnulinker.cpp
@@ -21,13 +21,18 @@
 using namespace std;
 using namespace Msp;
 
-GnuLinker::GnuLinker(Builder &b, const Architecture &a):
+GnuLinker::GnuLinker(Builder &b, const Architecture &a, const FS::Path &sysroot):
        Tool(b, a, "LINK")
 {
        input_suffixes.push_back(".o");
        input_suffixes.push_back(".a");
 
-       if(architecture->is_native())
+       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");
@@ -144,8 +149,11 @@ 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;
 }
 
@@ -166,9 +174,7 @@ Task *GnuLinker::Linker::run(const Target &target) const
        vector<string> argv;
        argv.push_back(executable->get_path().str());
 
-       const Component &comp = *bin.get_component();
-
-       FS::Path work_dir = comp.get_package().get_source_directory();
+       FS::Path work_dir = bin.get_component()->get_package().get_source_directory();
 
        if(const SharedLibrary *shlib = dynamic_cast<const SharedLibrary *>(&bin))
        {
@@ -196,7 +202,13 @@ Task *GnuLinker::Linker::run(const Target &target) const
                }
        }
 
-       const BuildInfo &binfo = comp.get_build_info();
+       BuildInfo binfo;
+       target.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());
        if(binfo.strip)
@@ -205,12 +217,15 @@ Task *GnuLinker::Linker::run(const Target &target) const
                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()));
 
        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);
+
        bool static_link_ok = (binfo.libmode<=BuildInfo::STATIC);
 
        const Target::Dependencies &depends = target.get_dependencies();
@@ -239,6 +254,13 @@ 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"))
+               {
+                       argv.push_back("-framework");
+                       argv.push_back(i->substr(0, i->size()-10));
+               }
+
        if(static_link_ok)
                argv.push_back("-static");
        else if(architecture->get_system()=="windows")