Skip to content

Commit dee9c92

Browse files
authored
Merge pull request #1912 from apple/lldb-Remove-unused-version-defines
[lldb] Remove unused version defines
2 parents e31457a + 8a33482 commit dee9c92

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

lldb/source/lldb.cpp

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,6 @@ static const char *GetLLDBRepository() {
3636
#endif
3737
}
3838

39-
#if LLDB_IS_BUILDBOT_BUILD
40-
static std::string GetBuildDate() {
41-
#if defined(LLDB_BUILD_DATE)
42-
return std::string(LLDB_BUILD_DATE);
43-
#else
44-
return std::string();
45-
#endif
46-
}
47-
#endif
48-
4939
#define QUOTE(str) #str
5040
#define EXPAND_AND_QUOTE(str) QUOTE(str)
5141

@@ -71,23 +61,14 @@ const char *lldb_private::GetVersion() {
7161
}
7262
g_version_str += ")";
7363
}
74-
75-
#if LLDB_IS_BUILDBOT_BUILD
76-
std::string build_date = GetBuildDate();
77-
if(!build_date.empty())
78-
g_version_str += " (buildbot " + build_date + ")";
79-
#endif
8064

8165
#ifdef LLDB_ENABLE_SWIFT
8266
auto const swift_version = swift::version::getSwiftFullVersion();
8367
g_version_str += "\n" + swift_version;
84-
#endif // LLDB_ENABLE_SWIFT
85-
68+
#else
8669
// getSwiftFullVersion() also prints clang and llvm versions, no
8770
// need to print them again. We keep this code here to not diverge
8871
// too much from upstream.
89-
#undef LLDB_UPSTREAM
90-
#ifdef LLDB_UPSTREAM
9172
std::string clang_rev(clang::getClangRevision());
9273
if (clang_rev.length() > 0) {
9374
g_version_str += "\n clang revision ";
@@ -98,7 +79,7 @@ const char *lldb_private::GetVersion() {
9879
g_version_str += "\n llvm revision ";
9980
g_version_str += llvm_rev;
10081
}
101-
#endif // LLDB_UPSTREAM
82+
#endif // LLDB_ENABLE_SWIFT
10283
}
10384
return g_version_str.c_str();
10485
}

0 commit comments

Comments
 (0)