[llvm] [bazel] Fully port 3773bbe9e7916ec89fb3e3cd02e29c54cabac82b (PR #169247)

[Aiden Grossman via llvm-commits]

https://github.com/boomanaiden154 created https://github.com/llvm/llvm-project/pull/169247

e5edb512072bc040face27ed6c9e92f4a5f1e910 attempted to port this, but seemed to miss a couple things that still showed up on CI. This patch fixes up the missing pieces.

>From 4fdae430d2d8f26fd620cc5931a1ab394ac74ef8 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Sun, 23 Nov 2025 21:36:07 +0000
Subject: [PATCH] [bazel] Fully port 3773bbe9e7916ec89fb3e3cd02e29c54cabac82b

e5edb512072bc040face27ed6c9e92f4a5f1e910 attempted to port this, but
seemed to miss a couple things that still showed up on CI. This patch
fixes up the missing pieces.
---
 utils/bazel/llvm-project-overlay/clang/BUILD.bazel              | 1 +
 utils/bazel/llvm-project-overlay/lldb/BUILD.bazel               | 2 +-
 .../bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
index 322863246032f..020b2aa68a357 100644
--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -2084,6 +2084,7 @@ cc_plugin_library(
         ":frontend",
         ":index",
         ":lex",
+        ":options",
         ":rewrite",
         ":sema",
         ":tooling",
diff --git a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
index 2e163d78e46d3..852921c392429 100644
--- a/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/lldb/BUILD.bazel
@@ -441,8 +441,8 @@ cc_library(
         ":Utility",
         ":Version",
         "//clang:codegen",
+        "//clang:driver",
         "//clang:frontend",
-        "//clang:options",
         "//clang:serialization",
         "//llvm:Support",
     ],
diff --git a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel
index 5eef544821b5c..45ab113931aaf 100644
--- a/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/lldb/source/Plugins/BUILD.bazel
@@ -188,6 +188,7 @@ cc_library(
         "//clang:basic",
         "//clang:codegen",
         "//clang:config",
+        "//clang:driver",
         "//clang:edit",
         "//clang:frontend",
         "//clang:frontend_rewrite",