goto-cc now reports version of installed gcc

Author: Daniel Kroening

src/goto-cc/gcc_mode.cpp

@@ -336,16 +336,26 @@ int gcc_modet::doit()
     base_name=="bcc" ||
     base_name.find("goto-bcc")!=std::string::npos;
 
+  // if we are gcc or bcc, then get the version number
+  gcc_version.get(native_tool_name);
+
   if((cmdline.isset('v') && cmdline.have_infile_arg()) ||
      (cmdline.isset("version") && !produce_hybrid_binary))
   {
     // "-v" a) prints the version and b) increases verbosity.
     // Compilation continues, don't exit!
 
     if(act_as_bcc)
-      std::cout << "bcc: version 0.16.17 (goto-cc " CBMC_VERSION ")\n";
+      std::cout << "bcc: version " << gcc_version
+                << " (goto-cc " CBMC_VERSION ")\n";
     else
-      std::cout << "gcc version 3.4.4 (goto-cc " CBMC_VERSION ")\n";
+    {
+      if(gcc_version.flavor == gcc_versiont::flavort::CLANG)
+        std::cout << "clang version " << gcc_version
+                  << " (goto-cc " CBMC_VERSION ")\n";
+      else
+        std::cout << "gcc (goto-cc " CBMC_VERSION ") " << gcc_version << '\n';
+    }
   }
 
   compilet compiler(cmdline,
@@ -359,11 +369,17 @@ int gcc_modet::doit()
     if(produce_hybrid_binary)
       return run_gcc(compiler);
 
-    std::cout << '\n' <<
-      "Copyright (C) 2006-2014 Daniel Kroening, Christoph Wintersteiger\n" <<
-      "CBMC version: " CBMC_VERSION << '\n' <<
-      "Architecture: " << config.this_architecture() << '\n' <<
-      "OS: " << config.this_operating_system() << '\n';
+    std::cout
+      << '\n'
+      << "Copyright (C) 2006-2018 Daniel Kroening, Christoph Wintersteiger\n"
+      << "CBMC version: " CBMC_VERSION << '\n'
+      << "Architecture: " << config.this_architecture() << '\n'
+      << "OS: " << config.this_operating_system() << '\n';
+
+    if(gcc_version.flavor == gcc_versiont::flavort::CLANG)
+      std::cout << "clang: " << gcc_version << '\n';
+    else
+      std::cout << "gcc: " << gcc_version << '\n';
 
     return EX_OK; // Exit!
   }
@@ -381,7 +397,7 @@ int gcc_modet::doit()
     if(cmdline.isset("dumpmachine"))
       std::cout << config.this_architecture() << '\n';
     else if(cmdline.isset("dumpversion"))
-      std::cout << "3.4.4\n";
+      std::cout << gcc_version << '\n';
 
     // we don't have any meaningful output for the other options, and GCC
     // doesn't necessarily produce non-empty output either

src/goto-cc/gcc_mode.h

@@ -15,6 +15,7 @@ Date: June 2006
 #define CPROVER_GOTO_CC_GCC_MODE_H
 
 #include "compile.h"
+#include "gcc_version.h"
 #include "goto_cc_mode.h"
 
 #include <util/cout_message.h>
@@ -61,6 +62,8 @@ class gcc_modet:public goto_cc_modet
     const compilet &compiler);
 
   static bool needs_preprocessing(const std::string &);
+
+  gcc_versiont gcc_version;
 };
 
 #endif // CPROVER_GOTO_CC_GCC_MODE_H