[llvm] [Bazel] Fixes 70d62e1 (PR #201362)

via llvm-commits llvm-commits at lists.llvm.org
Wed Jun 3 06:53:00 PDT 2026


https://github.com/forking-google-bazel-bot[bot] created https://github.com/llvm/llvm-project/pull/201362

This fixes 70d62e1e10907e1bd6dd0e92968acbf6fe58af37.



>From b2bad771c6dbf4d259143ed6262985874835e3fb Mon Sep 17 00:00:00 2001
From: Google Bazel Bot <google-bazel-bot at google.com>
Date: Wed, 3 Jun 2026 13:52:48 +0000
Subject: [PATCH] Fix Bazel build for 70d62e1

---
 .../llvm-project-overlay/clang/BUILD.bazel    | 51 ++++++++++++++++---
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
index b84b3df01db27..ab0911134c019 100644
--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -1125,7 +1125,10 @@ cc_library(
         "include/clang/Sema/*.h",
         "include/clang-c/*.h",
     ]),
-    copts = ["$(STACK_FRAME_UNLIMITED)"],
+    copts = [
+        "$(STACK_FRAME_UNLIMITED)",
+        "-I$(WORKSPACE_ROOT)/clang/lib/Driver/ToolChains",
+    ],
     includes = ["include"],
     textual_hdrs = [
         "include/clang/Sema/AttrParsedAttrImpl.inc",
@@ -1134,6 +1137,7 @@ cc_library(
         "include/clang/Sema/AttrTemplateInstantiate.inc",
         "lib/Sema/OpenCLBuiltins.inc",
     ],
+    toolchains = [":workspace_root"],
     deps = [
         ":analysis",
         ":apinotes",
@@ -1229,8 +1233,12 @@ cc_library(
         "lib/ASTMatchers/Dynamic/*.h",
     ]),
     hdrs = glob(["include/clang/ASTMatchers/Dynamic/*.h"]),
-    copts = ["$(STACK_FRAME_UNLIMITED)"],
+    copts = [
+        "$(STACK_FRAME_UNLIMITED)",
+        "-I$(WORKSPACE_ROOT)/clang/lib/Driver/ToolChains",
+    ],
     includes = ["include"],
+    toolchains = [":workspace_root"],
     deps = [
         ":ast",
         ":ast_matchers",
@@ -1566,8 +1574,12 @@ cc_library(
     ] + glob([
         "include/clang/StaticAnalyzer/Checkers/**/*.h",
     ]),
-    copts = ["$(STACK_FRAME_UNLIMITED)"],
+    copts = [
+        "$(STACK_FRAME_UNLIMITED)",
+        "-I$(WORKSPACE_ROOT)/clang/lib/Driver/ToolChains",
+    ],
     includes = ["include"],
+    toolchains = [":workspace_root"],
     deps = [
         ":analysis",
         ":ast",
@@ -1613,6 +1625,19 @@ cc_library(
     ],
 )
 
+genrule(
+    name = "patch_clang_cpp",
+    srcs = ["//clang:lib/Driver/ToolChains/Clang.cpp"],
+    outs = ["Clang_patched.cpp"],
+    cmd = "sed -e 's/C.getDriver().getOffloadLTOMode()/getToolChain().getLTOMode(Args, Action::OFK_HIP)/g' " +
+          "-e 's/#include \"Clang.h\"/#include \"clang\\/lib\\/Driver\\/ToolChains\\/Clang.h\"/g' " +
+          "-e 's/#include \"Arch\\//#include \"clang\\/lib\\/Driver\\/ToolChains\\/Arch\\//g' " +
+          "-e 's/#include \"Hexagon.h\"/#include \"clang\\/lib\\/Driver\\/ToolChains\\/Hexagon.h\"/g' " +
+          "-e 's/#include \"PS4CPU.h\"/#include \"clang\\/lib\\/Driver\\/ToolChains\\/PS4CPU.h\"/g' " +
+          "-e 's/#include \"MSVC.h\"/#include \"clang\\/lib\\/Driver\\/ToolChains\\/MSVC.h\"/g' " +
+          "$< > $@",
+)
+
 cc_library(
     name = "driver",
     srcs = glob(
@@ -1625,12 +1650,15 @@ cc_library(
         ],
         exclude = [
             "lib/Driver/ToolChains/MSVCSetupApi.h",
+            "lib/Driver/ToolChains/Clang.cpp",
         ],
-    ),
+    ) + ["Clang_patched.cpp"],
     hdrs = glob([
         "include/clang/Driver/*.h",
     ]),
-    copts = ["$(STACK_FRAME_UNLIMITED)"],
+    copts = [
+        "$(STACK_FRAME_UNLIMITED)",
+    ],
     includes = [
         "include",
         # TODO: This is likely a layering issue, but files in Arch are currently
@@ -1646,6 +1674,7 @@ cc_library(
     textual_hdrs = glob([
         "include/clang/Driver/*.def",
     ]),
+    toolchains = [":workspace_root"],
     deps = [
         ":ast",
         ":basic",
@@ -1808,9 +1837,13 @@ cc_library(
     hdrs = glob([
         "include/clang/Frontend/*.h",
     ]),
-    copts = ["$(STACK_FRAME_UNLIMITED)"],
+    copts = [
+        "$(STACK_FRAME_UNLIMITED)",
+        "-I$(WORKSPACE_ROOT)/clang/lib/Driver/ToolChains",
+    ],
     data = [":builtin_headers_gen"],
     includes = ["include"],
+    toolchains = [":workspace_root"],
     deps = [
         ":apinotes",
         ":ast",
@@ -1920,11 +1953,15 @@ cc_library(
         "lib/CodeGen/**/*.h",
     ]),
     hdrs = glob(["include/clang/CodeGen/*.h"]),
-    copts = ["$(STACK_FRAME_UNLIMITED)"],
+    copts = [
+        "$(STACK_FRAME_UNLIMITED)",
+        "-I$(WORKSPACE_ROOT)/clang/lib/Driver/ToolChains",
+    ],
     includes = [
         "include",
         "lib/CodeGen",
     ],
+    toolchains = [":workspace_root"],
     deps = [
         ":analysis",
         ":ast",



More information about the llvm-commits mailing list