From 4bed4887b42c93d4af4f99f0298f2fa5ea8fa86d Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Thu, 14 Sep 2023 14:11:40 -0700 Subject: [PATCH] Drop the lit LLVM patch because we don't use it anymore. (#3238) Noticed this while preparing #3237, just cleaning up. --- WORKSPACE | 3 +- ...atch => 0003_Add_library_for_clangd.patch} | 0 ...003_Modernize_py_binary_rule_for_lit.patch | 29 ------------------- 3 files changed, 1 insertion(+), 31 deletions(-) rename bazel/patches/llvm/{0004_Add_library_for_clangd.patch => 0003_Add_library_for_clangd.patch} (100%) delete mode 100644 bazel/patches/llvm/0003_Modernize_py_binary_rule_for_lit.patch diff --git a/WORKSPACE b/WORKSPACE index 4e3ba25cfbe8..946be4532c12 100644 --- a/WORKSPACE +++ b/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), diff --git a/bazel/patches/llvm/0004_Add_library_for_clangd.patch b/bazel/patches/llvm/0003_Add_library_for_clangd.patch similarity index 100% rename from bazel/patches/llvm/0004_Add_library_for_clangd.patch rename to bazel/patches/llvm/0003_Add_library_for_clangd.patch diff --git a/bazel/patches/llvm/0003_Modernize_py_binary_rule_for_lit.patch b/bazel/patches/llvm/0003_Modernize_py_binary_rule_for_lit.patch deleted file mode 100644 index bf2d1a0833e3..000000000000 --- a/bazel/patches/llvm/0003_Modernize_py_binary_rule_for_lit.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6cf44cd419a6171ced8e830cd9bdcb2da2667a0b Mon Sep 17 00:00:00 2001 -From: Chandler Carruth -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 -