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")
{
- ExportDefinitions *exp = new ExportDefinitions(builder, comp, *shlib);
- shlib->add_side_effect(*exp);
- const Tool &dlltool = builder.get_toolchain().get_tool("DLL");
- ImportLibrary *imp = dynamic_cast<ImportLibrary *>(dlltool.create_target(*exp));
- shlib->set_import_library(imp);
+ 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();
- inst_tgt->set_symlink(pattern.apply(shlib->get_libname()));
+ string link_name = pattern.apply(shlib->get_libname());
+ if(link_name!=FS::basename(inst_tgt->get_path()))
+ inst_tgt->set_symlink(link_name);
}
return inst_tgt;
}
}
-GnuLinker::Linker::Linker(GnuLinker &p, const string &compiler_tag):
- SubTool(p)
-{
- const Tool &compiler = builder.get_toolchain().get_tool(compiler_tag);
- if(dynamic_cast<const GnuCompiler *>(&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);
- }
-}
+GnuLinker::Linker::Linker(GnuLinker &p, const string &ct):
+ SubTool(p),
+ compiler_tag(ct)
+{ }
-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);
}
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();
+ }
+ else
+ {
+ string command;
+ if(compiler_tag=="CC")
+ command = "gcc";
+ else if(compiler_tag=="CXX")
+ command = "g++";
+ else
+ throw invalid_argument("GnuLinker::Linker::Linker");
+
+ set_executable(command, true);
+ }
+}
+
Task *GnuLinker::Linker::run(const Target &target) const
{
const Binary &bin = dynamic_cast<const Binary &>(target);
{
argv.push_back("-shared");
argv.push_back("-fPIC");
- const Target::Dependencies &side_eff = target.get_side_effects();
- for(Target::Dependencies::const_iterator i=side_eff.begin(); i!=side_eff.end(); ++i)
- {
- if(ExportDefinitions *exp = dynamic_cast<ExportDefinitions *>(*i))
- argv.push_back("-Wl,--output-def,"+relative(exp->get_path(), work_dir).str());
- }
if(architecture->get_system()!="windows" && !shlib->get_soname().empty())
argv.push_back("-Wl,-soname,"+shlib->get_soname());
}
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;
}
}