From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 14 Jul 2012 19:04:26 +0000 (+0300)
Subject: Simpler way to check g++ version
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=353f5d442804296ad5c8d457fd60d55756a57fba;p=builder.git

Simpler way to check g++ version
---

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index c3be0bc..18c6728 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,7 +1,6 @@
 #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"
@@ -20,7 +19,7 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
 
 	ExternalTask::Arguments argv;
 	argv.push_back(executable->get_path().str());
-	argv.push_back("--version");
+	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);
@@ -29,25 +28,15 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
 	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 = strip(task.get_output());
+		FS::Path cxx_path = FS::Path("/usr/include/c++")/cxx_ver;
+		if(FS::is_dir(cxx_path))
 		{
-			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);
-			}
+			builder.get_logger().log("tools", format("%s version is %s", FS::basename(executable->get_path()), cxx_ver));
+			system_path.push_back(cxx_path);
 		}
+	}
 }
 
 Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const