X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgnucompiler.cpp;h=4ee09ed5d97593c74c1130d509337ddec39b2ad0;hb=c5942a5c2fe7677a77b88254ee874bc09a5aa725;hp=a96f5a34d214faa47caa47936c25d17cd2727af8;hpb=68ef01e3f94ba5d0297e7979551e7d9404906db7;p=builder.git

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a96f5a3..4ee09ed 100644
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -104,6 +104,7 @@ string GnuCompiler::create_build_signature(const BuildInfo &binfo) const
 
 void GnuCompiler::do_prepare(ToolData &tool) const
 {
+	tool.extra_data = 0U;
 	prepare_syspath(tool);
 	prepare_version(tool);
 }
@@ -178,7 +179,11 @@ void GnuCompiler::prepare_version(ToolData &tool) const
 	string exe_path = exe->get_path().str();
 	unsigned version = query_version(exe_path, "-dumpversion");
 	if(version>=0x70000)
-		version = query_version(exe_path, "-dumpfullversion");
+	{
+		unsigned v = query_version(exe_path, "-dumpfullversion");
+		if(v)
+			version = v;
+	}
 	tool.extra_data = version;
 	builder.get_logger().log("tools", "%s version is %d.%d.%d", FS::basename(exe->get_path()), version>>16, (version>>8)&0xFF, version&0xFF);
 }