[Lldb-commits] [lldb] r317218 - Use LLVM version string

[Stephane Sezer via lldb-commits]

Author: sas
Date: Thu Nov  2 09:56:19 2017
New Revision: 317218

URL: http://llvm.org/viewvc/llvm-project?rev=317218&view=rev
Log:
Use LLVM version string

Summary:
macOS builds of LLDB use the bundle version from
`tools/driver/lldb-Info.plist`. That file hasn't been updated since the 4.0
release so the version we print provides no value. I also think that even if it
were up to date, that number has no meaning and displaying the version from the
LLVM tree is more valuable.

I know that Apple folks have some form of override for the clang version to
match the Xcode version, so it'd make sense for them to do the same for LLDB.

Reviewers: clayborg

Subscribers: lldb-commits

Differential Revision: https://reviews.llvm.org/D39429

Modified:
    lldb/trunk/source/lldb.cpp

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=317218&r1=317217&r2=317218&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Thu Nov  2 09:56:19 2017
@@ -47,13 +47,9 @@ const char *lldb_private::GetVersion() {
   // as the clang tool.
   static std::string g_version_str;
   if (g_version_str.empty()) {
-
-#ifdef LLDB_VERSION_STRING
-    g_version_str += EXPAND_AND_QUOTE(LLDB_VERSION_STRING);
-#else
     g_version_str += "lldb version ";
     g_version_str += CLANG_VERSION_STRING;
-#endif
+
     const char *lldb_repo = GetLLDBRepository();
     const char *lldb_rev = GetLLDBRevision();
     if (lldb_repo || lldb_rev) {