using namespace std;
using namespace Msp;
-GnuCompiler::GnuCompiler(Builder &b, const string &t, const string &n):
- Tool(b, t)
+GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
+ Tool(b, a, t)
{
- executable = builder.get_vfs().find_binary(n);
+ string command = c;
+ if(architecture->is_cross())
+ command = format("%s-%s", architecture->get_cross_prefix(), command);
+ executable = builder.get_vfs().find_binary(command);
- const Architecture &arch = builder.get_current_arch();
- if(arch.is_native())
+ if(architecture->is_native())
system_path.push_back("/usr/include");
else
- system_path.push_back("/usr/"+arch.get_cross_prefix()+"/include");
+ system_path.push_back("/usr/"+architecture->get_cross_prefix()+"/include");
}
Target *GnuCompiler::create_target(const list<Target *> &sources, const string &) const
Task *GnuCompiler::run(const Target &target) const
{
const ObjectFile &object = dynamic_cast<const ObjectFile &>(target);
- const Component &comp = object.get_component();
+ const Component &comp = *object.get_component();
ExternalTask::Arguments argv;
argv.push_back(executable->get_path().str());
argv.push_back("-c");
const BuildInfo &binfo = comp.get_build_info();
- for(BuildInfo::WordList::const_iterator i=binfo.warnings.begin(); i!=binfo.warnings.end(); ++i)
- argv.push_back("-W"+*i);
+ if(binfo.warning_level>=1)
+ {
+ argv.push_back("-Wall");
+ if(binfo.warning_level>=2)
+ {
+ argv.push_back("-Wextra");
+ argv.push_back("-Wundef");
+ }
+ if(binfo.warning_level>=3)
+ {
+ 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("-Wstrict-prototypes");
+ }
+ }
+ if(binfo.warning_level>=4)
+ {
+ // Some truly paranoid warnings
+ argv.push_back("-Wstrict-overflow=4");
+ argv.push_back("-Wfloat-equal");
+ argv.push_back("-Wconversion");
+ argv.push_back("-Wwrite-strings");
+ }
+ if(binfo.fatal_warnings)
+ argv.push_back("-Werror");
+ }
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)
+ if(comp.get_type()==Component::LIBRARY && architecture->get_system()!="windows")
argv.push_back("-fPIC");
- const Architecture &arch = builder.get_current_arch();
const Architecture &native_arch = builder.get_native_arch();
- if(arch.get_bits()!=native_arch.get_bits())
- argv.push_back(format("-m%d", arch.get_bits()));
+ if(architecture->get_bits()!=native_arch.get_bits())
+ argv.push_back(format("-m%d", architecture->get_bits()));
- const string &cpu = arch.get_cpu();
+ const string &cpu = architecture->get_cpu();
if(!cpu.empty())
argv.push_back("-march="+cpu);
FS::Path obj_path = object.get_path();
FS::Path src_path = object.get_source().get_path();
- FS::Path work_dir = comp.get_package().get_source();
+ FS::Path work_dir = comp.get_package().get_source_directory();
argv.push_back("-o");
argv.push_back(relative(obj_path, work_dir).str());