[cfe-commits] r68418 - in /cfe/trunk: include/clang/Driver/Options.def lib/Driver/Driver.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Sat Apr  4 00:17:38 2009
New Revision: 68418

URL: http://llvm.org/viewvc/llvm-project?rev=68418&view=rev
Log:
Driver: Handle -dumpversion, this is used by some configuration
scripts.

Modified:
    cfe/trunk/include/clang/Driver/Options.def
    cfe/trunk/lib/Driver/Driver.cpp

Modified: cfe/trunk/include/clang/Driver/Options.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.def?rev=68418&r1=68417&r2=68418&view=diff

==============================================================================
--- cfe/trunk/include/clang/Driver/Options.def (original)
+++ cfe/trunk/include/clang/Driver/Options.def Sat Apr  4 00:17:38 2009
@@ -384,7 +384,7 @@
 OPTION("-dependency-file", dependency_file, Separate, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-dumpmachine", dumpmachine, Flag, INVALID, INVALID, "u", 0, 0, 0)
 OPTION("-dumpspecs", dumpspecs, Flag, INVALID, INVALID, "u", 0, 0, 0)
-OPTION("-dumpversion", dumpversion, Flag, INVALID, INVALID, "u", 0, 0, 0)
+OPTION("-dumpversion", dumpversion, Flag, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-dylib_file", dylib__file, Separate, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-dylinker_install_name", dylinker__install__name, JoinedOrSeparate, INVALID, INVALID, "", 0, 0, 0)
 OPTION("-dylinker", dylinker, Flag, INVALID, INVALID, "", 0, 0, 0)

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=68418&r1=68417&r2=68418&view=diff

==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Sat Apr  4 00:17:38 2009
@@ -312,6 +312,8 @@
 #endif
   // FIXME: The following handlers should use a callback mechanism, we
   // don't know what the client would like to do.
+
+  // FIXME: Do not hardcode clang version.
   llvm::errs() << "clang version 1.0 (" << vers << " " << revision << ")" << "\n";
 
   const ToolChain &TC = C.getDefaultToolChain();
@@ -323,6 +325,12 @@
   // place, but we don't expect inconsistencies w.r.t. that to matter
   // in practice.
 
+  if (C.getArgs().hasArg(options::OPT_dumpversion)) {
+    // FIXME: Do not hardcode clang version.
+    llvm::outs() << "1.0\n";
+    return false;
+  }
+
   if (C.getArgs().hasArg(options::OPT__help)) {
     PrintHelp();
     return false;