Revert "Revert "Devise a package-private means to determine the LLVM version string""

We probably just need to touch LLVM's configure this time to work around the
totally inadequate Makefile build server integration.

This reverts commit r210314.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210320 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ece6bf8bce407493940c1e811025acff651d0b23..28f4e3fb81f6217d34e405939bc77e1543d2c016 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,6 +156,9 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
   endif()
 
   set( CLANG_BUILT_STANDALONE 1 )
+  set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}")
+else()
+  set(BACKEND_PACKAGE_STRING "${PACKAGE_STRING}")
 endif()
 
 find_package(LibXml2)

diff --git a/include/clang/Config/config.h.cmake b/include/clang/Config/config.h.cmake
index 8fa7a52a3e427d718e76e8c869411eaa3ac18a6d..40a6cb3a2e3e1767b6acb03768e985e9d90ffaa8 100644 (file)
--- a/include/clang/Config/config.h.cmake
+++ b/include/clang/Config/config.h.cmake
@@ -19,4 +19,7 @@
 /* Define if we have libxml2 */
 #cmakedefine CLANG_HAVE_LIBXML ${CLANG_HAVE_LIBXML}
 
+/* The LLVM product name and version */
+#define BACKEND_PACKAGE_STRING "${BACKEND_PACKAGE_STRING}"
+
 #endif

diff --git a/include/clang/Config/config.h.in b/include/clang/Config/config.h.in
index d66b4cf68dbc126c15dbb4821ff3e43c1255ee8f..450ea9b613e860430f32d695f9accc512c633ff5 100644 (file)
--- a/include/clang/Config/config.h.in
+++ b/include/clang/Config/config.h.in
@@ -22,4 +22,9 @@
 /* Define if we have libxml2 */
 #undef CLANG_HAVE_LIBXML
 
+#undef PACKAGE_STRING
+
+/* The LLVM product name and version */
+#define BACKEND_PACKAGE_STRING PACKAGE_STRING
+
 #endif

diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp
index ae32c011396d0877246ce56073f5abab9e79b9ba..c2b7753d41288ac94587f3cb35a1f8c9c3f1c984 100644 (file)
--- a/lib/Basic/Version.cpp
+++ b/lib/Basic/Version.cpp
@@ -13,7 +13,7 @@
 
 #include "clang/Basic/Version.h"
 #include "clang/Basic/LLVM.h"
-#include "llvm/Config/config.h"
+#include "clang/Config/config.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstdlib>
 #include <cstring>
@@ -130,7 +130,7 @@ std::string getClangToolFullVersion(StringRef ToolName) {
 
   // If vendor supplied, include the base LLVM version as well.
 #ifdef CLANG_VENDOR
-  OS << " (based on LLVM " << PACKAGE_VERSION << ")";
+  OS << " (based on " << BACKEND_PACKAGE_STRING << ")";
 #endif
 
   return OS.str();

diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp
index a967c0ab5467b90be3a307efb1ccf6bb31422b1e..f5e2749a718d605e9b77f12ed1d6bfdba82d4aea 100644 (file)
--- a/lib/Frontend/CompilerInstance.cpp
+++ b/lib/Frontend/CompilerInstance.cpp
@@ -16,6 +16,7 @@
 #include "clang/Basic/SourceManager.h"
 #include "clang/Basic/TargetInfo.h"
 #include "clang/Basic/Version.h"
+#include "clang/Config/config.h"
 #include "clang/Frontend/ChainedDiagnosticConsumer.h"
 #include "clang/Frontend/FrontendAction.h"
 #include "clang/Frontend/FrontendActions.h"
@@ -709,9 +710,7 @@ bool CompilerInstance::ExecuteAction(FrontendAction &Act) {
   // Validate/process some options.
   if (getHeaderSearchOpts().Verbose)
     OS << "clang -cc1 version " CLANG_VERSION_STRING
-#ifdef PACKAGE_STRING
-       << " based upon " << PACKAGE_STRING
-#endif
+       << " based upon " << BACKEND_PACKAGE_STRING
        << " default target " << llvm::sys::getDefaultTargetTriple() << "\n";
 
   if (getFrontendOpts().ShowTimers)