Avoid zeroing version of -dumpfullversion doesn't return anything

[builder.git] / source / gnucompiler.cpp

diff --git a/source/gnucompiler.cpp b/source/gnucompiler.cpp
index a96f5a34d214faa47caa47936c25d17cd2727af8..beff9f9a5674e3735e9fe7abeb7bc98c9bcce930 100644 (file)
--- a/source/gnucompiler.cpp
+++ b/source/gnucompiler.cpp
@@ -178,7 +178,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);
 }