[llvm] [lldb][bazel] Fix BUILD after dcbf0fcd0d5572f7001ebdd3bda6062593ec172b. (PR #90825)

[Christian Sigg via llvm-commits]

https://github.com/chsigg updated https://github.com/llvm/llvm-project/pull/90825

>From 192286acec9a119313e4d373c387d2b02d3375cd Mon Sep 17 00:00:00 2001
From: Christian Sigg <csigg at google.com>
Date: Thu, 2 May 2024 08:47:08 +0200
Subject: [PATCH 1/2] [lldb][bazel] Fix BUILD after
 dcbf0fcd0d5572f7001ebdd3bda6062593ec172b.

---
 .../llvm-project-overlay/lldb/BUILD.bazel     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
index b7b52f3ef59ce6..954b8933365499 100644
--- a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
@@ -183,18 +183,18 @@ cc_binary(
     ],
 )
 
-gentbl_cc_library(
+py_binary(
+    name = "generate-sbapi-dwarf-enum",
+    srcs = ["scripts/generate-sbapi-dwarf-enum.py"],
+    # main = "scripts/generate-sbapi-dwarf-enum.py",
+)
+
+genrule(
     name = "lldb-sbapi-dwarf-enums",
-    strip_include_prefix = "include",
-    tbl_outs = [
-        (
-            ["-gen-lldb-sbapi-dwarf-enum"],
-            "include/lldb/API/SBLanguages.h",
-        ),
-    ],
-    tblgen = ":lldb-tblgen",
-    td_file = "//llvm:include/llvm/BinaryFormat/Dwarf.def",
-    deps = [],
+    srcs = ["//llvm:include/llvm/BinaryFormat/Dwarf.def"],
+    outs = ["include/lldb/API/SBLanguages.h"],
+    cmd = "$(location :generate-sbapi-dwarf-enum) $(location //llvm:include/llvm/BinaryFormat/Dwarf.def) --output $@",
+    tools = [":generate-sbapi-dwarf-enum"],
 )
 
 cc_library(
@@ -202,11 +202,10 @@ cc_library(
     srcs = glob([
         "source/API/**/*.cpp",
         "source/API/**/*.h",
-    ]),
+    ]) + [":lldb-sbapi-dwarf-enums"],
     hdrs = glob(["include/lldb/API/**/*.h"]),
     strip_include_prefix = "include",
     deps = [
-        ":lldb-sbapi-dwarf-enums",
         ":Breakpoint",
         ":Commands",
         ":Core",
@@ -283,11 +282,10 @@ cc_library(
 
 cc_library(
     name = "Expression",
-    srcs = glob(["source/Expression/**/*.cpp"]),
+    srcs = glob(["source/Expression/**/*.cpp"]) + [":lldb-sbapi-dwarf-enums"],
     hdrs = glob(["include/lldb/Expression/**/*.h"]),
     strip_include_prefix = "include",
     deps = [
-        ":lldb-sbapi-dwarf-enums",
         ":Core",
         ":Headers",
         ":Host",
@@ -361,12 +359,10 @@ cc_library(
 
 cc_library(
     name = "ExpressionHeaders",
+    srcs = [":lldb-sbapi-dwarf-enums"],
     hdrs = glob(["include/lldb/Expression/**/*.h"]),
     strip_include_prefix = "include",
-    deps = [
-        ":lldb-sbapi-dwarf-enums",
-        "//llvm:ExecutionEngine"
-    ],
+    deps = ["//llvm:ExecutionEngine"],
 )
 
 cc_library(

>From a47d0c149aa1b5667ba1197251dc433fc1f16ad9 Mon Sep 17 00:00:00 2001
From: Christian Sigg <csigg at google.com>
Date: Thu, 2 May 2024 08:49:18 +0200
Subject: [PATCH 2/2] Remove commented out line.

---
 utils/bazel/llvm-project-overlay/lldb/BUILD.bazel | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
index 954b8933365499..ee011d3d8b61bb 100644
--- a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
@@ -186,7 +186,6 @@ cc_binary(
 py_binary(
     name = "generate-sbapi-dwarf-enum",
     srcs = ["scripts/generate-sbapi-dwarf-enum.py"],
-    # main = "scripts/generate-sbapi-dwarf-enum.py",
 )
 
 genrule(