[PATCH] D108500: [Bazel] Fix version defines

[Geoffrey Martin-Noble via Phabricator via llvm-commits]

GMNGeoffrey created this revision.
GMNGeoffrey added reviewers: MaskRay, chandlerc.
GMNGeoffrey requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Some of these were the wrong version and some of them were teh wrong
format. Did some hunting around to figure out what exactly they're
supposed to be. Since basically everything is derived from the LLVM
version we should probably make this a bit less hardcoded, but just
fixing the values for now.

Sources:
https://github.com/llvm/llvm-project/blob/b686fc7a1bea/clang/include/clang/Basic/Version.inc.in
https://github.com/llvm/llvm-project/blob/b686fc7a1bea/clang/CMakeLists.txt#L353-L363
https://github.com/llvm/llvm-project/blob/b686fc7a1bea/llvm/CMakeLists.txt#L13-L29
https://github.com/llvm/llvm-project/blob/b686fc7a1bea/lld/CMakeLists.txt#L131-L138


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D108500

Files:
  utils/bazel/llvm-project-overlay/clang/BUILD.bazel
  utils/bazel/llvm-project-overlay/lld/BUILD.bazel
  utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h


Index: utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
===================================================================
--- utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
+++ utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/llvm-config.h
@@ -74,7 +74,7 @@
 #define LLVM_USE_PERF 0
 
 /* Major version of the LLVM API */
-#define LLVM_VERSION_MAJOR 13
+#define LLVM_VERSION_MAJOR 14
 
 /* Minor version of the LLVM API */
 #define LLVM_VERSION_MINOR 0
@@ -83,7 +83,7 @@
 #define LLVM_VERSION_PATCH 0
 
 /* LLVM version string */
-#define LLVM_VERSION_STRING "13.0.0git"
+#define LLVM_VERSION_STRING "14.0.0git"
 
 /* Whether LLVM records statistics for use with GetStatistics(),
  * PrintStatistics() or PrintStatisticsJSON()
Index: utils/bazel/llvm-project-overlay/lld/BUILD.bazel
===================================================================
--- utils/bazel/llvm-project-overlay/lld/BUILD.bazel
+++ utils/bazel/llvm-project-overlay/lld/BUILD.bazel
@@ -13,7 +13,7 @@
 genrule(
     name = "config_version_gen",
     outs = ["include/lld/Common/Version.inc"],
-    cmd = "echo '#define LLD_VERSION_STRING \"git\"' > $@",
+    cmd = "echo '#define LLD_VERSION_STRING \"14.0.0\"' > $@",
 )
 
 genrule(
Index: utils/bazel/llvm-project-overlay/clang/BUILD.bazel
===================================================================
--- utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -344,11 +344,11 @@
     name = "basic_version_gen",
     outs = ["include/clang/Basic/Version.inc"],
     cmd = (
-        "echo '#define CLANG_VERSION 12.0' >> $@\n" +
-        "echo '#define CLANG_VERSION_MAJOR 12' >> $@\n" +
+        "echo '#define CLANG_VERSION 14.0.0' >> $@\n" +
+        "echo '#define CLANG_VERSION_MAJOR 14' >> $@\n" +
         "echo '#define CLANG_VERSION_MINOR 0' >> $@\n" +
         "echo '#define CLANG_VERSION_PATCHLEVEL 0' >> $@\n" +
-        "echo '#define CLANG_VERSION_STRING \"git\"' >> $@\n"
+        "echo '#define CLANG_VERSION_STRING \"14.0.0\"' >> $@\n"
     ),
 )
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D108500.367929.patch
Type: text/x-patch
Size: 2112 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210820/5314b2ed/attachment.bin>