using namespace Msp;
GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
- Tool(b, a, t)
+ Tool(b, a, t),
+ command(c)
{
- string command = c;
- if(architecture->is_cross())
- command = format("%s-%s", architecture->get_cross_prefix(), command);
- executable = builder.get_vfs().find_binary(command);
-
if(architecture->is_native())
system_path.push_back("/usr/include");
else
system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
}
-Target *GnuCompiler::create_target(const list<Target *> &sources, const string &) const
+Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
{
if(sources.size()!=1)
throw invalid_argument("GnuCCompiler::create_target");
return obj;
}
+string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
+{
+ string result = FS::basename(executable->get_path());
+ if(!architecture->get_cpu().empty())
+ {
+ result += ",m";
+ result += architecture->get_cpu();
+ }
+ result += ',';
+ if(binfo.debug)
+ result += 'g';
+ if(binfo.optimize)
+ {
+ result += 'O';
+ result += (binfo.optimize>0 ? '0'+binfo.optimize : 's');
+ }
+ return result;
+}
+
+void GnuCompiler::do_prepare()
+{
+ set_executable(command, true);
+}
+
Task *GnuCompiler::run(const Target &target) const
{
const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
argv.push_back(executable->get_path().str());
argv.push_back("-c");
- const BuildInfo &binfo = comp.get_build_info();
+ const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path());
if(binfo.warning_level>=1)
{
argv.push_back("-Wall");
argv.push_back("-pedantic");
argv.push_back("-Wno-long-long");
argv.push_back("-Wshadow");
- argv.push_back("-Winline");
if(tag=="CC")
{
argv.push_back("-Wc++-compat");
argv.push_back("-Wfloat-equal");
argv.push_back("-Wconversion");
argv.push_back("-Wwrite-strings");
+ argv.push_back("-Winline");
}
if(binfo.fatal_warnings)
argv.push_back("-Werror");
}
+ for(BuildInfo::PathList::const_iterator i=binfo.local_incpath.begin(); i!=binfo.local_incpath.end(); ++i)
+ {
+ argv.push_back("-iquote");
+ argv.push_back(i->str());
+ }
for(BuildInfo::PathList::const_iterator i=binfo.incpath.begin(); i!=binfo.incpath.end(); ++i)
argv.push_back("-I"+i->str());
for(BuildInfo::DefineMap::const_iterator i=binfo.defines.begin(); i!=binfo.defines.end(); ++i)
}
if(binfo.threads)
argv.push_back("-pthread");
- if(comp.get_type()==Component::LIBRARY && architecture->get_system()!="windows")
+ if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && architecture->get_system()!="windows")
argv.push_back("-fPIC");
const Architecture &native_arch = builder.get_native_arch();
argv.push_back(relative(obj_path, work_dir).str());
argv.push_back(relative(src_path, work_dir).str());
- if(!builder.get_dry_run())
- FS::mkpath(FS::dirname(obj_path), 0755);
-
return new ExternalTask(argv, work_dir);
}