diff options
| author | Ted Kremenek <kremenek@apple.com> | 2010-03-03 01:02:48 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2010-03-03 01:02:48 +0000 |
| commit | 971cc48dcae6719dc9e4e555fc4fcae8afc680fc (patch) | |
| tree | 569d667df99d322ce070ea996393614608ebd5a6 /lib/Basic/Version.cpp | |
| parent | 97ccfa599c0479a4ea9b4df9291c564d5afd80e3 (diff) | |
Make getClangRevision() check that SVN_VERSION is an empty string
(even if it is defined). This fixes the issue of this function
returning '0' when SVN_VERSION is defined to be "".
Fixes: <rdar://problem/7663667>
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@97620 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Basic/Version.cpp')
| -rw-r--r-- | lib/Basic/Version.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/Basic/Version.cpp b/lib/Basic/Version.cpp index 434ddf3f57..0c58b6007d 100644 --- a/lib/Basic/Version.cpp +++ b/lib/Basic/Version.cpp @@ -40,15 +40,15 @@ llvm::StringRef getClangRepositoryPath() { } std::string getClangRevision() { -#ifndef SVN_REVISION - // Subversion was not available at build time? - return ""; -#else - std::string revision; - llvm::raw_string_ostream OS(revision); - OS << strtol(SVN_REVISION, 0, 10); - return revision; +#ifdef SVN_REVISION + if (SVN_VERSION[0] != '\0') { + std::string revision; + llvm::raw_string_ostream OS(revision); + OS << strtol(SVN_REVISION, 0, 10); + return revision; + } #endif + return ""; } std::string getClangFullRepositoryVersion() { |