X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=da579ba5d0c132caf0b7c09d17e87bd3281e762e;hb=f182274c67f6e22cef57df560d33cd180a72f167;hp=ec1959afae67cfaf3a3f4a82e25e8a8c748f1a7a;hpb=7ed7c30ee0ceb734f17fe0c6d4bc6d37fb2ab5a7;p=builder.git diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp index ec1959a..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,11 +51,6 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const return result; } -void GnuCompiler::do_prepare() -{ - set_executable(command, true); -} - Task *GnuCompiler::run(const Target &target) const { const ObjectFile &object = dynamic_cast(target); @@ -121,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");