X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;h=c3be0bc61272b70b26f463dde447fad109613fc4;hb=e89616b514c77e189b93d5a46aa5a5a72e34c3cb;hp=3e0a4b87fae698ca248c345db05360c9bb306e07;hpb=519f2006e8b33e9b14fdc985766ab4e4e869544b;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index 3e0a4b8..c3be0bc 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -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"
@@ -9,16 +11,17 @@
 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,7 +37,7 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b):
 				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", 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;
 				}