Give targets the ability to gather their own build info

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index 5f69c0dca49ad5585153398cce07a20de07c9f32..16e24c0090c5bf43a45cd3d69a0559ddcb56acd9 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -1,6 +1,7 @@
 #include <msp/fs/dir.h>
 #include <msp/fs/utils.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
 #include "component.h"
@@ -13,9 +14,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");
@@ -54,7 +54,22 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 
 void GnuCompiler::do_prepare()
 {
-       set_executable(command, true);
+       executable = builder.get_vfs().find_binary(command);
+       if(executable)
+       {
+               ExternalTask::Arguments argv;
+               argv.push_back(executable->get_path().str());
+               argv.push_back("-dumpversion");
+
+               builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
+               try
+               {
+                       version = strip(ExternalTask::run_and_capture_output(argv));
+                       builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), version));
+               }
+               catch(const runtime_error &)
+               { }
+       }
 }
 
 Task *GnuCompiler::run(const Target &target) const
@@ -66,7 +81,9 @@ Task *GnuCompiler::run(const Target &target) const
        argv.push_back(executable->get_path().str());
        argv.push_back("-c");
 
-       const BuildInfo &binfo = comp.get_build_info_for_path(object.get_source().get_path());
+       BuildInfo binfo;
+       target.collect_build_info(binfo);
+
        if(binfo.warning_level>=1)
        {
                argv.push_back("-Wall");
@@ -121,13 +138,13 @@ Task *GnuCompiler::run(const Target &target) const
                else
                        argv.push_back(format("-O%d", binfo.optimize));
        }
-       if(binfo.threads && architecture->get_system()!="windows")
+       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");
 
        const Architecture &native_arch = builder.get_native_arch();
-       if(architecture->get_bits()!=native_arch.get_bits())
+       if(architecture->is_native() && architecture->get_bits()!=native_arch.get_bits())
                argv.push_back(format("-m%d", architecture->get_bits()));
 
        const string &cpu = architecture->get_cpu();