[Lldb-commits] [lldb] 7abfaa0 - [lldb] Define LLDB_VERSION_PATCH correctly

[Dimitry Andric via lldb-commits]

Author: Dimitry Andric
Date: 2022-04-29T19:29:51+02:00
New Revision: 7abfaa0a815a37ef6abd3ad7eb169007bdc36619

URL: https://github.com/llvm/llvm-project/commit/7abfaa0a815a37ef6abd3ad7eb169007bdc36619
DIFF: https://github.com/llvm/llvm-project/commit/7abfaa0a815a37ef6abd3ad7eb169007bdc36619.diff

LOG: [lldb] Define LLDB_VERSION_PATCH correctly

In commit ccf1469a4cdb lldb got its own generated Version.inc file, with
`LLDB_VERSION` macros. However, it used `LLDB_VERSION_PATCHLEVEL`
instead of the actually correct `LLDB_VERSION_PATCH`. Correct this.

Reviewed By: JDevlieghere

Differential Revision: https://reviews.llvm.org/D124672

Added: 
    

Modified: 
    lldb/include/lldb/Version/Version.inc.in
    llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/lldb/include/lldb/Version/Version.inc.in b/lldb/include/lldb/Version/Version.inc.in
index 5098bb1c2be5a..148bac2ffcff7 100644
--- a/lldb/include/lldb/Version/Version.inc.in
+++ b/lldb/include/lldb/Version/Version.inc.in
@@ -2,5 +2,5 @@
 #define LLDB_VERSION_STRING "@LLDB_VERSION@"
 #define LLDB_VERSION_MAJOR @LLDB_VERSION_MAJOR@
 #define LLDB_VERSION_MINOR @LLDB_VERSION_MINOR@
-#define LLDB_VERSION_PATCHLEVEL @LLDB_VERSION_PATCHLEVEL@
+#define LLDB_VERSION_PATCH @LLDB_VERSION_PATCH@
 #cmakedefine LLDB_FULL_VERSION_STRING "@LLDB_FULL_VERSION_STRING@"

diff  --git a/llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn b/llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn
index 43987b3712623..2093c57c50763 100644
--- a/llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/include/lldb/Version/BUILD.gn
@@ -9,7 +9,7 @@ write_cmake_config("version") {
     "LLDB_VERSION=$llvm_version",
     "LLDB_VERSION_MAJOR=$llvm_version_major",
     "LLDB_VERSION_MINOR=$llvm_version_minor",
-    "LLDB_VERSION_PATCHLEVEL=$llvm_version_patch",
+    "LLDB_VERSION_PATCH=$llvm_version_patch",
     "LLDB_FULL_VERSION_STRING=",
   ]
 }