X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=da579ba5d0c132caf0b7c09d17e87bd3281e762e;hb=71554f76b7ae8f1f9d183dc0c522655ce458cb78;hp=06ad5a9d7e0037735cbc89c18bb2709bd7053070;hpb=b1c51196b34f644e821f351c2acdb48619aed2e3;p=builder.git diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index 06ad5a9..da579ba 100644 --- a/source/gnucompiler.cpp +++ b/source/gnucompiler.cpp @@ -13,23 +13,16 @@ using namespace std; using namespace Msp; -GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c): +GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t): Tool(b, a, t) { - string command = c; - if(architecture->is_cross()) - command = format("%s-%s", architecture->get_cross_prefix(), command); - executable = builder.get_vfs().find_binary(command); - if(!executable) - builder.problem(string(), format("Can't find executable %s for tool %s", command, tag)); - 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 &sources, const string &) const +Target *GnuCompiler::create_target(const list &sources, const string &) { if(sources.size()!=1) throw invalid_argument("GnuCCompiler::create_target"); @@ -122,7 +115,7 @@ Task *GnuCompiler::run(const Target &target) const else argv.push_back(format("-O%d", binfo.optimize)); } - if(binfo.threads) + if(binfo.threads && architecture->get_system()!="windows" && architecture->get_system()!="darwin") argv.push_back("-pthread"); if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && architecture->get_system()!="windows") argv.push_back("-fPIC");