X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucxxcompiler.cpp;h=9e206cc6b525edca08587ec43e966eba37afdf76;hb=c51e8844f19c31b2809ba459a1659d3b94a86f89;hp=18c6728464d7d34f6fd7d2f0a68a7485acf724b7;hpb=353f5d442804296ad5c8d457fd60d55756a57fba;p=builder.git

diff --git a/source/gnucxxcompiler.cpp b/source/gnucxxcompiler.cpp
index 18c6728..9e206cc 100644
--- a/source/gnucxxcompiler.cpp
+++ b/source/gnucxxcompiler.cpp
@@ -17,19 +17,19 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
 	input_suffixes.push_back(".cc");
 	aux_suffixes.push_back(".hpp");
 
+	if(executable)
+		query_version();
+}
+
+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())));
-	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)
+	try
 	{
-		string cxx_ver = strip(task.get_output());
+		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))
 		{
@@ -37,6 +37,8 @@ GnuCxxCompiler::GnuCxxCompiler(Builder &b, const Architecture &a):
 			system_path.push_back(cxx_path);
 		}
 	}
+	catch(const runtime_error &)
+	{ }
 }
 
 Target *GnuCxxCompiler::create_source(const Component &comp, const FS::Path &path) const