[cfe-commits] r122080 - in /cfe/trunk: include/clang/Basic/Version.h lib/Driver/Driver.cpp

[Eric Christopher]

Author: echristo
Date: Fri Dec 17 13:13:21 2010
New Revision: 122080

URL: http://llvm.org/viewvc/llvm-project?rev=122080&view=rev
Log:
Horrible hack for systems that use -dumpversion with clang to expect versions
that match gcc versions. Eew.

Modified:
    cfe/trunk/include/clang/Basic/Version.h
    cfe/trunk/lib/Driver/Driver.cpp

Modified: cfe/trunk/include/clang/Basic/Version.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Version.h?rev=122080&r1=122079&r2=122080&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Version.h (original)
+++ cfe/trunk/include/clang/Basic/Version.h Fri Dec 17 13:13:21 2010
@@ -40,6 +40,10 @@
   CLANG_MAKE_VERSION_STRING(CLANG_VERSION_MAJOR,CLANG_VERSION_MINOR)
 #endif
 
+/// \brief A horrible hack to work around projects that depend upon gcc
+/// compatible compilers having versions that resemble gcc.
+#define GCC_COMPAT_VERSION_STRING CLANG_MAKE_VERSION_STRING(4,2)
+
 namespace clang {
   /// \brief Retrieves the repository path (e.g., Subversion path) that 
   /// identifies the particular Clang branch, tag, or trunk from which this

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=122080&r1=122079&r2=122080&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Fri Dec 17 13:13:21 2010
@@ -417,8 +417,11 @@
     return false;
   }
 
+  // This is a horrible hack. Some projects depend on gcc-like versions
+  // coming out of gcc -dumpversion to determine if the gcc compatible
+  // compiler has a correct version. Ideally we'd fix all of those projects.
   if (C.getArgs().hasArg(options::OPT_dumpversion)) {
-    llvm::outs() << CLANG_VERSION_STRING "\n";
+    llvm::outs() << GCC_COMPAT_VERSION_STRING "\n";
     return false;
   }