using namespace Msp;
GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
- GnuCompiler(b, a, "CXX", "g++")
+ 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())));
- ExternalTask task(argv);
- task.set_stdout(ExternalTask::CAPTURE);
- task.set_stderr(ExternalTask::IGNORE);
- task.start();
- Task::Status status;
- while((status=task.check())==Task::RUNNING) ;
- if(status==Task::SUCCESS)
+ try
{
- string cxx_ver = strip(task.get_output());
+ 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))
{
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, path);
}
+
+void GnuCxxCompiler::do_prepare()
+{
+ GnuCompiler::do_prepare();
+ if(executable)
+ query_version();
+}