#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);
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;
}