X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;h=d1d05d8b80b9ce6b5b1da5a24b8b0491c4f5a899;hb=d0ad2256a21b9e83ad408564a1521b98617f20ba;hp=c3be0bc61272b70b26f463dde447fad109613fc4;hpb=25a315f3cb5805614c513ac762ea1bd512ce82cb;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index c3be0bc..d1d05d8 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,53 +1,17 @@
 #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, const Architecture &a):
-	GnuCompiler(b, a, "CXX", "g++")
+GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a, const FS::Path &sysroot):
+	GnuCompiler(b, a, "CXX", sysroot)
 {
+	set_command("g++", true);
 	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
@@ -59,3 +23,14 @@ Target *GnuCxxCompiler::create_source(const FS::Path &path) const
 {
 	return new CSourceFile(builder, path);
 }
+
+void GnuCxxCompiler::do_prepare()
+{
+	GnuCompiler::do_prepare();
+	if(!version.empty())
+	{
+		FS::Path cxx_path = FS::Path("/usr/include/c++")/version;
+		if(FS::is_dir(cxx_path))
+			system_path.push_back(cxx_path);
+	}
+}