X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;fp=source%2Fgnucxxcompiler.cpp;h=af001b3b569cfcd68e06dd67b5a4f16b4a6320af;hb=7777d548fddca66b21f26273faedfdf675b10234;hp=cff2c0c23671c0be09b952bcf5aa8875adeb787a;hpb=75b778b75c14df7b93ab2efbd55bc65b80a72c15;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index cff2c0c..af001b3 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -1,10 +1,5 @@
 #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;
@@ -19,26 +14,6 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
 	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())));
-	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);
@@ -52,7 +27,10 @@ Target *GnuCxxCompiler::create_source(const FS::Path &path) const
 void GnuCxxCompiler::do_prepare()
 {
 	GnuCompiler::do_prepare();
-	executable = builder.get_vfs().find_binary(command);
-	if(executable)
-		query_version();
+	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);
+	}
 }