Просмотр исходного кода

Drop the lit LLVM patch because we don't use it anymore. (#3238)

Noticed this while preparing #3237, just cleaning up.
Jon Ross-Perkins 2 лет назад
Родитель
Сommit
4bed4887b4

+ 1 - 2
WORKSPACE

@@ -122,8 +122,7 @@ http_archive(
     patches = [
         "@carbon//bazel/patches/llvm:0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch",
         "@carbon//bazel/patches/llvm:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch",
-        "@carbon//bazel/patches/llvm:0003_Modernize_py_binary_rule_for_lit.patch",
-        "@carbon//bazel/patches/llvm:0004_Add_library_for_clangd.patch",
+        "@carbon//bazel/patches/llvm:0003_Add_library_for_clangd.patch",
     ],
     sha256 = "50b8ff1c8088f2ebec19a523575b76c52e0a251d8fc4a8b5282a33177b109f49",
     strip_prefix = "llvm-project-{0}".format(llvm_version),

+ 0 - 0
bazel/patches/llvm/0004_Add_library_for_clangd.patch → bazel/patches/llvm/0003_Add_library_for_clangd.patch


+ 0 - 29
bazel/patches/llvm/0003_Modernize_py_binary_rule_for_lit.patch

@@ -1,29 +0,0 @@
-From 6cf44cd419a6171ced8e830cd9bdcb2da2667a0b Mon Sep 17 00:00:00 2001
-From: Chandler Carruth <chandlerc@gmail.com>
-Date: Sun, 12 Mar 2023 10:33:27 +0000
-Subject: [PATCH] Modernize `py_binary` rule for `lit`.
-
-This adds the a `main` attribute to clarify where the script should
-start execution, and more importantly adds the `imports` list to setup
-`PYTHONPATH` correctly for the tool's `import`s to find the internal
-libraries.
----
- utils/bazel/llvm-project-overlay/llvm/BUILD.bazel | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-index c4b1998e647f..ae615f23a98c 100644
---- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
-@@ -4555,6 +4555,8 @@ py_binary(
-     name = "lit",
-     testonly = True,
-     srcs = ["utils/lit/lit.py"] + glob(["utils/lit/lit/**/*.py"]),
-+    imports = ["utils/lit"],
-+    main = "utils/lit/lit.py",
- )
- 
- cc_library(
--- 
-2.39.2
-