]> git.tdb.fi Git - builder.git/blobdiff - source/gnucxxcompiler.cpp
Remove dead code
[builder.git] / source / gnucxxcompiler.cpp
index 09235810e1fa3878dfdd11d538c3c5354b2f691f..c3be0bc61272b70b26f463dde447fad109613fc4 100644 (file)
@@ -1,6 +1,8 @@
 #include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include <msp/strings/regex.h>
+#include <msp/strings/utils.h>
 #include "builder.h"
 #include "csourcefile.h"
 #include "externaltask.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", "g++")
 {
        input_suffixes.push_back(".cpp");
        input_suffixes.push_back(".cc");
        aux_suffixes.push_back(".hpp");
 
        ExternalTask::Arguments argv;
-       argv.push_back(name);
+       argv.push_back(executable->get_path().str());
        argv.push_back("--version");
+       builder.get_logger().log("auxcommands", format("Running %s", join(argv.begin(), argv.end())));
        ExternalTask task(argv);
        task.set_stdout(ExternalTask::CAPTURE);
        task.set_stderr(ExternalTask::IGNORE);
@@ -34,8 +37,7 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b):
                                FS::Path cxx_path = FS::Path("/usr/include/c++")/cxx_ver;
                                if(FS::is_dir(cxx_path))
                                {
-                                       if(builder.get_verbose()>=5)
-                                               IO::print("%s version is %s\n", name, cxx_ver);
+                                       builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), cxx_ver));
                                        system_path.push_back(cxx_path);
                                        break;
                                }