Redesign the way commands are set for tools

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 7d1d166579467f4213735f0975d354a2690c55d4..cd7391f0277175578a22536e1bd3d5bb7a122368 100644 (file)
--- 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<const ObjectFile &>(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")
                argv.push_back("-pthread");
        if((comp.get_type()==Component::LIBRARY || comp.get_type()==Component::MODULE) && architecture->get_system()!="windows")
                argv.push_back("-fPIC");