<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Okay cool, thanks Chris!<div class=""><br class=""></div><div class="">-Todd</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Nov 10, 2016, at 1:40 PM, Chris Bieneman <<a href="mailto:beanz@apple.com" class="">beanz@apple.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta http-equiv="Content-Type" content="text/html charset=us-ascii" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">I just pushed r286504, which expects the string to not be quoted. This should solve the bot failures.<div class=""><br class=""></div><div class="">-Chris</div><div class=""><br class=""><div class=""><blockquote type="cite" class=""><div class="">On Nov 10, 2016, at 1:30 PM, Todd Fiala <<a href="mailto:todd.fiala@gmail.com" class="">todd.fiala@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">I'm at a point where I can look at it.</div><div class="gmail_extra"><br class=""><div class="gmail_quote">On Thu, Nov 10, 2016 at 12:17 PM, Tim Hammerquist <span dir="ltr" class=""><<a href="mailto:penryu@gmail.com" target="_blank" class="">penryu@gmail.com</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr" class="">Looks like the quotes around the lldb version string aren't properly preserved in the xcodeproj file as they are in CMake.<div class=""><br class=""></div><div class="">Can any of the LLDB devs more comfortable with plumbing the depths of Xcode project configuration provide some guidance here?</div><div class=""><br class=""></div><div class=""><div style="font-size:12.8px" class=""><a href="http://lab.llvm.org:8080/green/job/lldb_build_test/21828/" target="_blank" class="">http://lab.llvm.org:8080/green<wbr class="">/job/lldb_build_test/21828/</a><br class=""></div></div><div class=""><br class=""></div><div class=""><div class="">/Users/buildslave/jenkins/<wbr class="">sharedspace/lldb@2/lldb/<wbr class="">source/lldb.cpp:63:22: error: unexpected namespace name 'lldb': expected expression</div><div class="">    g_version_str += LLDB_VERSION_STRING;</div><div class="">                     ^</div><div class="">In file included from <built-in>:356:</div><div class=""><command line>:4:29: note: expanded from here</div><div class="">#define LLDB_VERSION_STRING lldb-360.99.0</div><div class="">                            ^</div><div class="">/Users/buildslave/jenkins/<wbr class="">sharedspace/lldb@2/lldb/<wbr class="">source/lldb.cpp:63:22: error: invalid suffix '.0' on floating constant</div><div class="">In file included from <built-in>:356:</div><div class=""><command line>:4:40: note: expanded from here</div><div class="">#define LLDB_VERSION_STRING lldb-360.99.0</div><div class="">                                       ^</div><div class="">2 errors generated.</div></div><div class=""><br class=""></div></div><div class="gmail_extra"><div class=""><div class="h5"><br class=""><div class="gmail_quote">On Thu, Nov 10, 2016 at 9:33 AM, Chris Bieneman via lldb-commits <span dir="ltr" class=""><<a href="mailto:lldb-commits@lists.llvm.org" target="_blank" class="">lldb-commits@lists.llvm.org</a>></span> wrote:<br class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br class="">
Date: Thu Nov 10 11:33:19 2016<br class="">
New Revision: 286479<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=286479&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject?rev=286479&view=rev</a><br class="">
Log:<br class="">
Unify Darwin and Non-Darwin printing of version output<br class="">
<br class="">
Summary:<br class="">
This change unifies and simplifies the code paths between the Darwin and non-Darwin code to print the LLDB version information.<br class="">
<br class="">
It also introduces a new variable in CMake LLDB_VERSION_STRING which can be used to specify custom version information. On Darwin this value is implicitly set based on the resource/LLDB-Info.plist file.<br class="">
<br class="">
With the LLDB_VERSION_STRING variable set to lldb-360.99.0, the -version output is:<br class="">
<br class="">
> ./bin/lldb -version<br class="">
lldb version 4.0.0 (lldb-360.99.0)<br class="">
  clang revision 286264<br class="">
  llvm revision 286265<br class="">
<br class="">
This behavior is unified across all target platforms.<br class="">
<br class="">
Reviewers: lldb-commits<br class="">
<br class="">
Subscribers: mgorny, tfiala<br class="">
<br class="">
Differential Revision: <a href="https://reviews.llvm.org/D26478" rel="noreferrer" target="_blank" class="">https://reviews.llvm.org/D2647<wbr class="">8</a><br class="">
<br class="">
Added:<br class="">
    lldb/trunk/cmake/modules/Embed<wbr class="">AppleVersion.cmake<br class="">
Modified:<br class="">
    lldb/trunk/lldb.xcodeproj/proj<wbr class="">ect.pbxproj<br class="">
    lldb/trunk/source/CMakeLists.t<wbr class="">xt<br class="">
    lldb/trunk/source/lldb.cpp<br class="">
<br class="">
Added: lldb/trunk/cmake/modules/Embed<wbr class="">AppleVersion.cmake<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/EmbedAppleVersion.cmake?rev=286479&view=auto" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/lldb/trunk/cmake/modules<wbr class="">/EmbedAppleVersion.cmake?rev=<wbr class="">286479&view=auto</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- lldb/trunk/cmake/modules/Embed<wbr class="">AppleVersion.cmake (added)<br class="">
+++ lldb/trunk/cmake/modules/Embed<wbr class="">AppleVersion.cmake Thu Nov 10 11:33:19 2016<br class="">
@@ -0,0 +1,11 @@<br class="">
+execute_process(COMMAND /usr/libexec/PlistBuddy -c "Print:CFBundleVersion" ${LLDB_INFO_PLIST}<br class="">
+                OUTPUT_VARIABLE BundleVersion<br class="">
+                OUTPUT_STRIP_TRAILING_WHITESPA<wbr class="">CE)<br class="">
+<br class="">
+file(APPEND "${HEADER_FILE}.tmp"<br class="">
+    "#define LLDB_VERSION_STRING \"lldb-${BundleVersion}\"\n")<br class="">
+<br class="">
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different<br class="">
+  "${HEADER_FILE}.tmp" "${HEADER_FILE}")<br class="">
+<br class="">
+file(REMOVE "${HEADER_FILE}.tmp")<br class="">
<br class="">
Modified: lldb/trunk/lldb.xcodeproj/proj<wbr class="">ect.pbxproj<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=286479&r1=286478&r2=286479&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/lldb/trunk/lldb.xcodepro<wbr class="">j/project.pbxproj?rev=286479&<wbr class="">r1=286478&r2=286479&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- lldb/trunk/lldb.xcodeproj/proj<wbr class="">ect.pbxproj (original)<br class="">
+++ lldb/trunk/lldb.xcodeproj/proj<wbr class="">ect.pbxproj Thu Nov 10 11:33:19 2016<br class="">
@@ -8775,6 +8775,20 @@<br class="">
                                        "\"$(SYSTEM_LIBRARY_DIR)/Priva<wbr class="">teFrameworks\"",<br class="">
                                );<br class="">
                                GCC_INLINES_ARE_PRIVATE_EXTERN = NO;<br class="">
+                               GCC_PREPROCESSOR_DEFINITIONS = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_DEBUG,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
+                               "GCC_PREPROCESSOR_<wbr class="">DEFINITIONS[sdk=iphoneos*][<wbr class="">arch=*]" = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_DEBUG,<br class="">
+                                       LLDB_DISABLE_PYTHON,<br class="">
+                                       NO_XPC_SERVICES,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
                                HEADER_SEARCH_PATHS = /usr/include/libxml2;<br class="">
                                LLDB_COMPRESSION_CFLAGS = "";<br class="">
                                "LLDB_COMPRESSION_CFLAGS[sdk=m<wbr class="">acosx10.11]" = "-DHAVE_LIBCOMPRESSION=1";<br class="">
@@ -8820,6 +8834,20 @@<br class="">
                                        "\"$(SYSTEM_LIBRARY_DIR)/Priva<wbr class="">teFrameworks\"",<br class="">
                                );<br class="">
                                GCC_INLINES_ARE_PRIVATE_EXTERN = NO;<br class="">
+                               GCC_PREPROCESSOR_DEFINITIONS = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_RELEASE,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
+                               "GCC_PREPROCESSOR_<wbr class="">DEFINITIONS[sdk=iphoneos*][<wbr class="">arch=*]" = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_RELEASE,<br class="">
+                                       LLDB_DISABLE_PYTHON,<br class="">
+                                       NO_XPC_SERVICES,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
                                HEADER_SEARCH_PATHS = /usr/include/libxml2;<br class="">
                                LLDB_COMPRESSION_CFLAGS = "";<br class="">
                                "LLDB_COMPRESSION_CFLAGS[sdk=m<wbr class="">acosx10.11]" = "-DHAVE_LIBCOMPRESSION=1";<br class="">
@@ -8865,6 +8893,20 @@<br class="">
                                        "\"$(SYSTEM_LIBRARY_DIR)/Priva<wbr class="">teFrameworks\"",<br class="">
                                );<br class="">
                                GCC_INLINES_ARE_PRIVATE_EXTERN = NO;<br class="">
+                               GCC_PREPROCESSOR_DEFINITIONS = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_BUILD_AND_<wbr class="">INTEGRATION,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
+                               "GCC_PREPROCESSOR_<wbr class="">DEFINITIONS[sdk=iphoneos*][<wbr class="">arch=*]" = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_BUILD_AND_<wbr class="">INTEGRATION,<br class="">
+                                       LLDB_DISABLE_PYTHON,<br class="">
+                                       NO_XPC_SERVICES,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
                                HEADER_SEARCH_PATHS = /usr/include/libxml2;<br class="">
                                LLDB_COMPRESSION_CFLAGS = "";<br class="">
                                "LLDB_COMPRESSION_CFLAGS[sdk=m<wbr class="">acosx10.11]" = "-DHAVE_LIBCOMPRESSION=1";<br class="">
@@ -9864,6 +9906,20 @@<br class="">
                                        "\"$(SYSTEM_LIBRARY_DIR)/Priva<wbr class="">teFrameworks\"",<br class="">
                                );<br class="">
                                GCC_INLINES_ARE_PRIVATE_EXTERN = NO;<br class="">
+                               GCC_PREPROCESSOR_DEFINITIONS = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_DEBUG,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
+                               "GCC_PREPROCESSOR_<wbr class="">DEFINITIONS[sdk=iphoneos*][<wbr class="">arch=*]" = (<br class="">
+                                       __STDC_CONSTANT_MACROS,<br class="">
+                                       __STDC_LIMIT_MACROS,<br class="">
+                                       LLDB_CONFIGURATION_DEBUG,<br class="">
+                                       LLDB_DISABLE_PYTHON,<br class="">
+                                       NO_XPC_SERVICES,<br class="">
+                                       "LLDB_VERSION_STRING=\"lldb-$<wbr class="">{CURRENT_PROJECT_VERSION}\"",<br class="">
+                               );<br class="">
                                HEADER_SEARCH_PATHS = /usr/include/libxml2;<br class="">
                                LLDB_COMPRESSION_CFLAGS = "";<br class="">
                                "LLDB_COMPRESSION_CFLAGS[sdk=m<wbr class="">acosx10.11]" = "-DHAVE_LIBCOMPRESSION=1";<br class="">
<br class="">
Modified: lldb/trunk/source/CMakeLists.t<wbr class="">xt<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=286479&r1=286478&r2=286479&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/lldb/trunk/source/CMakeL<wbr class="">ists.txt?rev=286479&r1=286478&<wbr class="">r2=286479&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- lldb/trunk/source/CMakeLists.t<wbr class="">xt (original)<br class="">
+++ lldb/trunk/source/CMakeLists.t<wbr class="">xt Thu Nov 10 11:33:19 2016<br class="">
@@ -25,21 +25,6 @@ set(lldbBase_SOURCES<br class="">
     lldb.cpp<br class="">
   )<br class="">
<br class="">
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")<br class="">
-  set(LLDB_VERS_GENERATED_FILE ${LLDB_BINARY_DIR}/source/LLDB<wbr class="">_vers.c)<br class="">
-  add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}<br class="">
-    COMMAND ${LLDB_SOURCE_DIR}/scripts/<a href="http://generate-vers.pl/" rel="noreferrer" target="_blank" class="">gen<wbr class="">erate-vers.pl</a><br class="">
-            ${LLDB_SOURCE_DIR}/lldb.xcodep<wbr class="">roj/project.pbxproj liblldb_core<br class="">
-            > ${LLDB_VERS_GENERATED_FILE}<br class="">
-    DEPENDS ${LLDB_SOURCE_DIR}/scripts/<a href="http://generate-vers.pl/" rel="noreferrer" target="_blank" class="">gen<wbr class="">erate-vers.pl</a><br class="">
-            ${LLDB_SOURCE_DIR}/lldb.xcodep<wbr class="">roj/project.pbxproj)<br class="">
-  set_source_files_properties(${<wbr class="">LLDB_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)<br class="">
-  # Add this to lldbBase since lldb.cpp uses the symbol defined here.<br class="">
-  list(APPEND lldbBase_SOURCES ${LLDB_VERS_GENERATED_FILE})<br class="">
-  add_custom_target(lldbGenerate<wbr class="">dVersion<br class="">
-    DEPENDS ${LLDB_VERS_GENERATED_FILE})<br class="">
-endif()<br class="">
-<br class="">
 foreach(file<br class="">
         "${LLDB_SOURCE_DIR}/.git/<wbr class="">logs/HEAD" # Git<br class="">
         "${LLDB_SOURCE_DIR}/.svn/wc.d<wbr class="">b"     # SVN 1.7<br class="">
@@ -75,14 +60,37 @@ if(DEFINED lldb_vc)<br class="">
   list(APPEND lldbBase_SOURCES ${version_inc})<br class="">
 endif()<br class="">
<br class="">
+if(APPLE)<br class="">
+  set(apple_version_inc "${CMAKE_CURRENT_BINARY_DIR}/A<wbr class="">ppleVersion.inc")<br class="">
+  set(apple_version_script "${LLDB_SOURCE_DIR}/cmake/modu<wbr class="">les/EmbedAppleVersion.cmake")<br class="">
+  set(info_plist ${LLDB_SOURCE_DIR}/resources/L<wbr class="">LDB-Info.plist)<br class="">
+<br class="">
+  # Create custom target to generate the VC revision include.<br class="">
+  add_custom_command(OUTPUT "${apple_version_inc}"<br class="">
+    DEPENDS "${apple_version_script}" "${info_plist}"<br class="">
+    COMMAND<br class="">
+    ${CMAKE_COMMAND} "-DLLDB_INFO_PLIST=${info_plis<wbr class="">t}"<br class="">
+                     "-DHEADER_FILE=${apple_versio<wbr class="">n_inc}"<br class="">
+                     -P "${apple_version_script}")<br class="">
+<br class="">
+  # Mark the generated header as being generated.<br class="">
+  set_source_files_properties("$<wbr class="">{apple_version_inc}"<br class="">
+    PROPERTIES GENERATED TRUE<br class="">
+               HEADER_FILE_ONLY TRUE)<br class="">
+<br class="">
+  # Tell Version.cpp that it needs to build with -DHAVE_SVN_VERSION_INC.<br class="">
+  set_source_files_properties(ll<wbr class="">db.cpp<br class="">
+    PROPERTIES COMPILE_DEFINITIONS "HAVE_APPLE_VERSION_INC")<br class="">
+  list(APPEND lldbBase_SOURCES ${apple_version_inc})<br class="">
+elseif(LLDB_VERSION_STRING)<br class="">
+  set_source_files_properties(ll<wbr class="">db.cpp<br class="">
+    PROPERTIES COMPILE_DEFINITIONS "LLDB_VERSION_STRING=\"${LLDB_<wbr class="">VERSION_STRING}\"")<br class="">
+endif()<br class="">
+<br class="">
 add_lldb_library(lldbBase<br class="">
   ${lldbBase_SOURCES}<br class="">
   )<br class="">
<br class="">
-if (CMAKE_SYSTEM_NAME MATCHES "Darwin")<br class="">
-  add_dependencies(lldbBase lldbGeneratedVersion)<br class="">
-endif()<br class="">
-<br class="">
 add_subdirectory(Breakpoint)<br class="">
 add_subdirectory(Commands)<br class="">
 add_subdirectory(Core)<br class="">
<br class="">
Modified: lldb/trunk/source/lldb.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=286479&r1=286478&r2=286479&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-pr<wbr class="">oject/lldb/trunk/source/lldb.<wbr class="">cpp?rev=286479&r1=286478&r2=<wbr class="">286479&view=diff</a><br class="">
==============================<wbr class="">==============================<wbr class="">==================<br class="">
--- lldb/trunk/source/lldb.cpp (original)<br class="">
+++ lldb/trunk/source/lldb.cpp Thu Nov 10 11:33:19 2016<br class="">
@@ -12,16 +12,16 @@<br class="">
 using namespace lldb;<br class="">
 using namespace lldb_private;<br class="">
<br class="">
-#if defined(__APPLE__)<br class="">
-extern "C" const unsigned char liblldb_coreVersionString[];<br class="">
-#else<br class="">
-<br class="">
 #include "clang/Basic/Version.h"<br class="">
<br class="">
 #ifdef HAVE_SVN_VERSION_INC<br class="">
 #  include "SVNVersion.inc"<br class="">
 #endif<br class="">
<br class="">
+#ifdef HAVE_APPLE_VERSION_INC<br class="">
+#  include "AppleVersion.inc"<br class="">
+#endif<br class="">
+<br class="">
 static const char *GetLLDBRevision() {<br class="">
 #ifdef LLDB_REVISION<br class="">
   return LLDB_REVISION;<br class="">
@@ -38,33 +38,8 @@ static const char *GetLLDBRepository() {<br class="">
 #endif<br class="">
 }<br class="">
<br class="">
-#endif<br class="">
<br class="">
 const char *lldb_private::GetVersion() {<br class="">
-#if defined(__APPLE__)<br class="">
-  static char g_version_string[32];<br class="">
-  if (g_version_string[0] == '\0') {<br class="">
-    const char *version_string =<br class="">
-        ::strstr((const char *)liblldb_coreVersionString, "PROJECT:");<br class="">
-<br class="">
-    if (version_string)<br class="">
-      version_string += sizeof("PROJECT:") - 1;<br class="">
-    else<br class="">
-      version_string = "unknown";<br class="">
-<br class="">
-    const char *newline_loc = strchr(version_string, '\n');<br class="">
-<br class="">
-    size_t version_len = sizeof(g_version_string) - 1;<br class="">
-<br class="">
-    if (newline_loc &&<br class="">
-        (newline_loc - version_string < static_cast<ptrdiff_t>(version<wbr class="">_len)))<br class="">
-      version_len = newline_loc - version_string;<br class="">
-<br class="">
-    ::snprintf(g_version_string, version_len + 1, "%s", version_string);<br class="">
-  }<br class="">
-<br class="">
-  return g_version_string;<br class="">
-#else<br class="">
   // On platforms other than Darwin, report a version number in the same style<br class="">
   // as the clang tool.<br class="">
   static std::string g_version_str;<br class="">
@@ -81,21 +56,24 @@ const char *lldb_private::GetVersion() {<br class="">
     if (lldb_rev) {<br class="">
       g_version_str += " revision ";<br class="">
       g_version_str += lldb_rev;<br class="">
+      g_version_str += ")";<br class="">
     }<br class="">
+#ifdef LLDB_VERSION_STRING<br class="">
+    g_version_str += " (";<br class="">
+    g_version_str += LLDB_VERSION_STRING;<br class="">
+    g_version_str += ")";<br class="">
+#endif<br class="">
     std::string clang_rev(clang::getClangRevis<wbr class="">ion());<br class="">
     if (clang_rev.length() > 0) {<br class="">
-      g_version_str += " clang revision ";<br class="">
+      g_version_str += "\n  clang revision ";<br class="">
       g_version_str += clang_rev;<br class="">
     }<br class="">
     std::string llvm_rev(clang::getLLVMRevisio<wbr class="">n());<br class="">
     if (llvm_rev.length() > 0) {<br class="">
-      g_version_str += " llvm revision ";<br class="">
+      g_version_str += "\n  llvm revision ";<br class="">
       g_version_str += llvm_rev;<br class="">
     }<br class="">
-<br class="">
-    if (lldb_repo)<br class="">
-      g_version_str += ")";<br class="">
+<br class="">
   }<br class="">
   return g_version_str.c_str();<br class="">
-#endif<br class="">
 }<br class="">
<br class="">
<br class="">
______________________________<wbr class="">_________________<br class="">
lldb-commits mailing list<br class="">
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank" class="">lldb-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/<wbr class="">mailman/listinfo/lldb-commits</a><br class="">
</blockquote></div><br class=""><br clear="all" class=""><div class=""><br class=""></div></div></div><span class="HOEnZb"><font color="#888888" class="">-- <br class=""><div class="m_-7474826755733297080gmail_signature" data-smartmail="gmail_signature">Tim <<a href="mailto:penryu@gmail.com" target="_blank" class="">penryu@gmail.com</a>></div>
</font></span></div>
</blockquote></div><br class=""><br clear="all" class=""><div class=""><br class=""></div>-- <br class=""><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr" class="">-Todd</div></div>
</div>
</div></blockquote></div><br class=""></div></div></div></blockquote></div><br class=""></div></body></html>