#include "builder.h"
#include "component.h"
#include "csourcefile.h"
-#include "externaltask.h"
#include "gnucompiler.h"
#include "objcsourcefile.h"
#include "objectfile.h"
}
GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t):
- Tool(b, a, t),
- version(0)
+ Tool(b, &a, t)
{
if(tag=="CC")
{
throw invalid_argument("GnuCompiler::GnuCompiler");
set_command((tag=="CXX" ? "g++" : "gcc"), true);
+ set_run_external(_run);
}
Target *GnuCompiler::create_source(const Component &comp, const FS::Path &path) const
return new CSourceFile(builder, path);
}
-Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
+Target *GnuCompiler::create_target(const vector<Target *> &sources, const string &)
{
if(sources.size()!=1)
- throw invalid_argument("GnuCCompiler::create_target");
+ throw invalid_argument("GnuCompiler::create_target");
SourceFile &source = dynamic_cast<SourceFile &>(*sources.front());
ObjectFile *obj = new ObjectFile(builder, *source.get_component(), source);
obj->set_tool(*this);
if(!executable)
return string();
- string result = FS::basename(executable->get_path());
+ string result = Tool::create_build_signature(binfo);
if(!architecture->get_cpu().empty())
{
result += ",m";
result += architecture->get_cpu();
}
- result += ',';
+ if(binfo.debug || binfo.optimize)
+ result += ',';
if(binfo.debug)
result += 'g';
if(binfo.optimize)
return result;
}
-void GnuCompiler::do_prepare()
+void GnuCompiler::do_prepare(ToolData &tool) const
{
- executable = builder.get_vfs().find_binary(command);
- prepare_syspath();
- prepare_version();
+ tool.extra_data = 0U;
+ prepare_syspath(tool);
+ prepare_version(tool);
+
+ if(tag=="CXX")
+ tool.build_info.libs.push_back("stdc++");
}
-void GnuCompiler::prepare_syspath()
+void GnuCompiler::prepare_syspath(ToolData &tool) const
{
bool path_found = false;
- const FS::Path &sysroot = build_info.sysroot;
+ const FS::Path &sysroot = tool.build_info.sysroot;
+ const std::string &tool_tag = static_cast<Tool &>(tool).get_tag();
- if(executable)
+ const FileTarget *exe = static_cast<Tool &>(tool).get_executable();
+ if(exe)
{
ExternalTask::Arguments argv;
- argv.push_back(executable->get_path().str());
+ argv.push_back(exe->get_path().str());
argv.push_back("-Wp,-v");
argv.push_back("-E");
if(tag=="CXX")
argv.push_back("--sysroot="+sysroot.str());
argv.push_back("-");
- builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+ builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
try
{
string output = ExternalTask::run_and_capture_output(argv, FS::Path(), true);
else if(record_path)
{
FS::Path path = strip(output.substr(start, newline-start));
- builder.get_logger().log("tools", format("Got %s system path: %s", tag, path));
- system_path.push_back(path);
+ builder.get_logger().log("tools", "Got %s system path: %s", tool_tag, path);
+ tool.system_path.push_back(path);
}
start = newline+1;
}
if(!path_found)
{
- builder.get_logger().log("tools", format("No %s system path found, using defaults", tag));
+ builder.get_logger().log("tools", "No %s system path found, using defaults", tool_tag);
+ const Architecture &arch = *static_cast<Tool &>(tool).get_architecture();
if(!sysroot.empty())
- system_path.push_back(sysroot/"usr/include");
- else if(architecture->is_native())
- system_path.push_back("/usr/include");
+ tool.system_path.push_back(sysroot/"usr/include");
+ else if(arch.is_native())
+ tool.system_path.push_back("/usr/include");
else
- system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
+ tool.system_path.push_back(format("/usr/%s/include", arch.get_cross_prefix()));
}
}
-void GnuCompiler::prepare_version()
+void GnuCompiler::prepare_version(ToolData &tool) const
{
- if(!executable)
+ const FileTarget *exe = static_cast<Tool &>(tool).get_executable();
+ if(!exe)
return;
- prepare_version("-dumpversion");
+ string exe_path = exe->get_path().str();
+ unsigned version = query_version(exe_path, "-dumpversion");
if(version>=0x70000)
- prepare_version("-dumpfullversion");
- builder.get_logger().log("tools", format("%s version is %d.%d.%d", FS::basename(executable->get_path()), version>>16, (version>>8)&0xFF, version&0xFF));
+ {
+ unsigned v = query_version(exe_path, "-dumpfullversion");
+ if(v)
+ version = v;
+ }
+ tool.extra_data = version;
+ builder.get_logger().log("tools", "%s version is %d.%d.%d", FS::basename(exe->get_path()), version>>16, (version>>8)&0xFF, version&0xFF);
}
-void GnuCompiler::prepare_version(const string &arg)
+unsigned GnuCompiler::query_version(const string &exe_path, const string &arg) const
{
ExternalTask::Arguments argv;
- argv.push_back(executable->get_path().str());
+ argv.push_back(exe_path);
argv.push_back(arg);
- builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+ builder.get_logger().log("auxcommands", "Running %s", join(argv.begin(), argv.end()));
+ unsigned ver = 0;
try
{
string version_str = strip(ExternalTask::run_and_capture_output(argv));
vector<string> version_parts = split(version_str, '.');
- version = 0;
for(unsigned i=0; (i<3 && i<version_parts.size()); ++i)
- version |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
+ ver |= lexical_cast<unsigned>(version_parts[i])<<(16-8*i);
}
catch(const runtime_error &)
{ }
+
+ return ver;
}
-Task *GnuCompiler::run(const Target &target) const
+ExternalTask::Arguments GnuCompiler::_run(const ObjectFile &object, FS::Path &work_dir)
{
- const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
+ const Tool &tool = *object.get_tool();
+ const Architecture &arch = *tool.get_architecture();
ExternalTask::Arguments argv;
- argv.push_back(executable->get_path().str());
+ argv.push_back(tool.get_executable()->get_path().str());
argv.push_back("-c");
BuildInfo binfo;
- target.collect_build_info(binfo);
+ object.collect_build_info(binfo);
- string tag_for_std = (tag=="OBJC" ? "CC" : tag);
+ const std::string &tool_tag = tool.get_tag();
+ string tag_for_std = (tool_tag=="OBJC" ? "CC" : tool_tag);
if(binfo.standards.count(tag_for_std))
argv.push_back("-std="+get_item(binfo.standards, tag_for_std).str());
- if(tag=="OBJC" && binfo.standards.count(tag))
- argv.push_back("-fobjc-std="+get_item(binfo.standards, tag).str());
+ if(tool_tag=="OBJC" && binfo.standards.count(tool_tag))
+ argv.push_back("-fobjc-std="+get_item(binfo.standards, tool_tag).str());
if(binfo.warning_level>=1)
{
{
argv.push_back("-Wextra");
argv.push_back("-Wundef");
+ unsigned version = tool.get_extra_data();
if(version>=0x80000)
argv.push_back("-Wno-cast-function-type");
}
argv.push_back("-pedantic");
argv.push_back("-Wno-long-long");
argv.push_back("-Wshadow");
- if(tag=="CC")
+ if(tool_tag=="CC")
{
argv.push_back("-Wc++-compat");
argv.push_back("-Wstrict-prototypes");
const FS::Path &sysroot = binfo.sysroot;
if(!sysroot.empty())
argv.push_back("--sysroot="+sysroot.str());
- for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+ for(const FS::Path &p: binfo.local_incpath)
{
argv.push_back("-iquote");
- argv.push_back(i->str());
+ argv.push_back(p.str());
}
- for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
- argv.push_back("-I"+i->str());
+ for(const FS::Path &p: binfo.incpath)
+ argv.push_back("-I"+p.str());
- for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
+ for(const auto &kvp: binfo.defines)
{
- if(i->second.empty())
- argv.push_back(format("-D%s", i->first));
+ if(kvp.second.empty())
+ argv.push_back(format("-D%s", kvp.first));
else
- argv.push_back(format("-D%s=%s", i->first, i->second));
+ argv.push_back(format("-D%s=%s", kvp.first, kvp.second));
}
if(binfo.debug)
if(binfo.debug)
argv.push_back("-fno-omit-frame-pointer");
}
- 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");
- if(object.is_used_in_shared_library() && architecture->get_system()!="windows")
+ if(object.is_used_in_shared_library() && arch.get_system()!="windows")
argv.push_back("-fPIC");
- if((architecture->get_type()=="x86" || architecture->get_type()=="ppc") && !architecture->is_native())
- argv.push_back(format("-m%d", architecture->get_bits()));
+ if((arch.get_type()=="x86" || arch.get_type()=="ppc") && !arch.is_native())
+ argv.push_back(format("-m%d", arch.get_bits()));
- string cpu = architecture->get_cpu();
+ string cpu = arch.get_cpu();
if(!cpu.empty())
{
for(unsigned i=0; cpus[i]; i+=2)
argv.push_back("-march="+cpu);
}
- if(!architecture->get_fpu().empty())
+ if(!arch.get_fpu().empty())
{
- if(architecture->get_type()=="x86")
+ if(arch.get_type()=="x86")
{
- if(architecture->get_fpu()=="387")
+ if(arch.get_fpu()=="387")
argv.push_back("-mfpmath=387");
- else if(!architecture->get_fpu().compare(0, 3, "sse"))
+ else if(!arch.get_fpu().compare(0, 3, "sse"))
argv.push_back("-mfpmath=sse");
- if(architecture->get_fpu()=="sse")
+ if(arch.get_fpu()=="sse")
argv.push_back("-msse2");
- else if(architecture->get_fpu()=="sse3")
+ else if(arch.get_fpu()=="sse3")
argv.push_back("-msse3");
- else if(architecture->get_fpu()=="sse4.1")
+ else if(arch.get_fpu()=="sse4.1")
argv.push_back("-msse4.1");
}
- else if(architecture->get_type()=="arm")
+ else if(arch.get_type()=="arm")
{
- argv.push_back("-mfpu="+architecture->get_fpu());
+ argv.push_back("-mfpu="+arch.get_fpu());
argv.push_back("-mfloat-abi=softfp");
}
}
FS::Path obj_path = object.get_path();
FS::Path src_path = object.get_source().get_path();
- FS::Path work_dir = object.get_component()->get_package().get_source_directory();
argv.push_back("-o");
argv.push_back(relative(obj_path, work_dir).str());
argv.push_back(relative(src_path, work_dir).str());
- return new ExternalTask(argv, work_dir);
+ return argv;
}
projects / builder.git / blobdiff