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");
delete cxx_linker;
}
-Target *GnuLinker::create_target(const list<Target *> &sources, const string &arg) const
+Target *GnuLinker::create_target(const list<Target *> &sources, const string &arg)
{
if(sources.empty())
throw invalid_argument("GnuLinker::create_target");
SharedLibrary *shlib = new SharedLibrary(builder, comp, objs);
if(architecture->get_system()=="windows")
{
- const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
+ Tool &dlltool = builder.get_toolchain().get_tool("DLL");
dlltool.create_target(*shlib);
}
bin = shlib;
{
if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(&target))
{
- const Tool © = builder.get_toolchain().get_tool("CP");
+ Tool © = builder.get_toolchain().get_tool("CP");
InstalledFile *inst_tgt = dynamic_cast<InstalledFile *>(copy.create_target(target));
if(architecture->get_system()=="windows")
- builder.add_installed_target(*shlib->get_import_library());
+ builder.get_build_graph().add_installed_target(*shlib->get_import_library());
else
{
const Pattern &pattern = architecture->get_shared_library_patterns().front();
}
-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<const GnuCompiler *>(&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<Target *> &sources, const string &arg) const
+Target *GnuLinker::Linker::create_target(const list<Target *> &sources, const string &arg)
{
return parent.create_target(sources, arg);
}
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<GnuCompiler *>(&compiler))
+ {
+ compiler.prepare();
+ executable = compiler.get_executable();
+ }
+}
+
Task *GnuLinker::Linker::run(const Target &target) const
{
const Binary &bin = dynamic_cast<const Binary &>(target);
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))
{
argv.push_back("-shared");
argv.push_back("-fPIC");
if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
- argv.push_back("-Wl,-soname,"+shlib->get_soname());
+ {
+ 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);
+
+ 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)
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()));
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();
for(Target::Dependencies::const_iterator i=depends.begin(); i!=depends.end(); ++i)
{
+ FileTarget *file = dynamic_cast<FileTarget *>(*i);
Target *tgt = (*i)->get_real_target();
if(ObjectFile *obj = dynamic_cast<ObjectFile *>(tgt))
argv.push_back(relative(obj->get_path(), work_dir).str());
else if(StaticLibrary *stlib = dynamic_cast<StaticLibrary *>(tgt))
- argv.push_back(stlib->get_path().str());
+ argv.push_back((file?file:stlib)->get_path().str());
else if(SharedLibrary *shlib = dynamic_cast<SharedLibrary *>(tgt))
{
argv.push_back("-l"+shlib->get_libname());
if(shlib)
argv.push_back("-l"+shlib->get_libname());
else
- argv.push_back(imp->get_path().str());
+ 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(static_link_ok)
argv.push_back("-static");
else if(architecture->get_system()=="windows")
projects / builder.git / blobdiff