+#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", "g++")
{
input_suffixes.push_back(".cpp");
input_suffixes.push_back(".cc");
+ aux_suffixes.push_back(".hpp");
+
+ 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);
+}