X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;h=c3be0bc61272b70b26f463dde447fad109613fc4;hb=2aaad259f2dff58c1e909f1e6d83961e78fd7d3e;hp=7c863a51b2ad5aff193b340bceedcbd42021a34d;hpb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index 7c863a5..c3be0bc 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,16 +1,61 @@
+#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"
 #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("--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);
+	task.start();
+	Task::Status status;
+	while((status=task.check())==Task::RUNNING) ;
+	if(status==Task::SUCCESS)
+		if(RegMatch m = Regex("[0-9]\\.[0-9.]+").match(task.get_output()))
+		{
+			string cxx_ver = m[0].str;
+			while(!cxx_ver.empty())
+			{
+				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);
+					break;
+				}
+
+				string::size_type dot = cxx_ver.rfind('.');
+				if(dot==string::npos)
+					break;
+				cxx_ver.erase(dot);
+			}
+		}
 }
 
 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);
+}