X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=da579ba5d0c132caf0b7c09d17e87bd3281e762e;hb=6e02286dcbd62b8f5ef56987c2298d54b689ad9c;hp=7d1d166579467f4213735f0975d354a2690c55d4;hpb=9e28243c9687608ec3c32954b4031490296ae877;p=builder.git diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index 7d1d166..da579ba 100644 --- a/source/gnucompiler.cpp +++ b/source/gnucompiler.cpp @@ -13,9 +13,8 @@ using namespace std; using namespace Msp; -GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c): - Tool(b, a, t), - command(c) +GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t): + Tool(b, a, t) { if(architecture->is_native()) system_path.push_back("/usr/include"); @@ -52,15 +51,6 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const return result; } -void GnuCompiler::do_prepare() -{ - 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)); -} - Task *GnuCompiler::run(const Target &target) const { const ObjectFile &object = dynamic_cast(target); @@ -125,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");