The mingw port of gcc doesn't recognize -pthread

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 06ad5a9d7e0037735cbc89c18bb2709bd7053070..5f69c0dca49ad5585153398cce07a20de07c9f32 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -14,22 +14,16 @@ using namespace std;
 using namespace Msp;
 
 GnuCompiler::GnuCompiler(Builder &b, const Architecture &a, const string &t, const string &c):
-       Tool(b, a, t)
+       Tool(b, a, t),
+       command(c)
 {
-       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<Target *> &sources, const string &) const
+Target *GnuCompiler::create_target(const list<Target *> &sources, const string &)
 {
        if(sources.size()!=1)
                throw invalid_argument("GnuCCompiler::create_target");
@@ -58,6 +52,11 @@ 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<const ObjectFile &>(target);
@@ -122,7 +121,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");