maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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

llvm-svn: 317218
This commit is contained in:
Stephane Sezer 2017-11-02 16:56:19 +00:00
parent ebe429d99f
commit b55c8b1f16
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/lldb.cpp
View File

@ -47,13 +47,9 @@ const char *lldb_private::GetVersion() {
// as the clang tool. // as the clang tool.
static std::string g_version_str; static std::string g_version_str;
if (g_version_str.empty()) { 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 += "lldb version ";
g_version_str += CLANG_VERSION_STRING; g_version_str += CLANG_VERSION_STRING;
#endif
const char *lldb_repo = GetLLDBRepository(); const char *lldb_repo = GetLLDBRepository();
const char *lldb_rev = GetLLDBRevision(); const char *lldb_rev = GetLLDBRevision();
if (lldb_repo || lldb_rev) { if (lldb_repo || lldb_rev) {