Add and improve build signatures for some tools

[builder.git] / source / gnucxxcompiler.cpp

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index fb7fbdce2cf37d0601f545e40c71d5c9528e0a5d..55f7109e7b05470bb03ac690d98a970ce0323bf4 100644 (file)
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,17 +1,57 @@
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/print.h>
+#include <msp/strings/utils.h>
+#include "builder.h"
 #include "csourcefile.h"
+#include "externaltask.h"
 #include "gnucxxcompiler.h"
 
+using namespace std;
 using namespace Msp;
 
-GnuCxxCompiler::GnuCxxCompiler(Builder &b):
-       GnuCompiler(b, "CXX", "g++")
+GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
+       GnuCompiler(b, a, "CXX")
 {
+       set_command("g++", true);
        input_suffixes.push_back(".cpp");
        input_suffixes.push_back(".cc");
        aux_suffixes.push_back(".hpp");
 }
 
+void GnuCxxCompiler::query_version()
+{
+       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
+       {
+               string cxx_ver = strip(ExternalTask::run_and_capture_output(argv));
+               FS::Path cxx_path = FS::Path("/usr/include/c++")/cxx_ver;
+               if(FS::is_dir(cxx_path))
+               {
+                       builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), cxx_ver));
+                       system_path.push_back(cxx_path);
+               }
+       }
+       catch(const runtime_error &)
+       { }
+}
+
 Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const
 {
        return new CSourceFile(builder, comp, path);
 }
+
+Target *GnuCxxCompiler::create_source(const FS::Path &path) const
+{
+       return new CSourceFile(builder, path);
+}
+
+void GnuCxxCompiler::do_prepare()
+{
+       GnuCompiler::do_prepare();
+       if(executable)
+               query_version();
+}