1 files changed, 14 insertions, 13 deletions
diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp
index 3817dd4574e..efdcef8f052 100644
--- a/lldb/source/lldb.cpp
+++ b/lldb/source/lldb.cpp
@@ -47,25 +47,26 @@ 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();
-    if (lldb_repo) {
-      g_version_str += " (";
-      g_version_str += lldb_repo;
-    }
-
     const char *lldb_rev = GetLLDBRevision();
-    if (lldb_rev) {
-      g_version_str += " revision ";
-      g_version_str += lldb_rev;
+    if (lldb_repo || lldb_rev) {
+      g_version_str += " (";
+      if (lldb_repo)
+        g_version_str += lldb_repo;
+      if (lldb_rev) {
+        g_version_str += " revision ";
+        g_version_str += lldb_rev;
+      }
       g_version_str += ")";
     }
-#ifdef LLDB_VERSION_STRING
-    g_version_str += " (";
-    g_version_str += EXPAND_AND_QUOTE(LLDB_VERSION_STRING);
-    g_version_str += ")";
-#endif
+
     std::string clang_rev(clang::getClangRevision());
     if (clang_rev.length() > 0) {
       g_version_str += "\n  clang revision ";