diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ebc6a1df7637..9c5c81ae9c34 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -180,7 +180,6 @@ repos: .github/pull_request_template.md| compile_flags.txt| third_party/.*| - bazel/llvm_patches/.*\.patch| .*\.def| .*\.svg| .*/fuzzer_corpus/.*| @@ -188,10 +187,10 @@ repos: )$ - id: check-links -# Most third-party code is in submodules; local commits are excluded here. -# We fully exclude fuzzer corpus directories as they are generated binary data. +# This excludes third-party code, and patches to third-party code. exclude: | (?x)^( + bazel/patches/.*\.patch| third_party/examples/.*/carbon/.*| third_party/llvm-project/.*| )$ diff --git a/WORKSPACE b/WORKSPACE index d4e17c8ba2a3..7106f77d678f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -119,8 +119,8 @@ http_archive( build_file_content = "# empty", patch_args = ["-p1"], patches = [ - "@carbon//bazel/llvm_patches:0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch", - "@carbon//bazel/llvm_patches:0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch", + "@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", ], sha256 = "8e9cbb937b1a40536cd809e09603a1810d86a8c314fee0cca36fc493e78289e5", strip_prefix = "llvm-project-{0}".format(llvm_version), diff --git a/bazel/llvm_patches/0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch b/bazel/patches/llvm/0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch similarity index 100% rename from bazel/llvm_patches/0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch rename to bazel/patches/llvm/0001_Patch_for_mallinfo2_when_using_Bazel_build_system.patch diff --git a/bazel/llvm_patches/0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch b/bazel/patches/llvm/0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch similarity index 100% rename from bazel/llvm_patches/0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch rename to bazel/patches/llvm/0002_Added_Bazel_build_for_compiler_rt_fuzzer.patch diff --git a/bazel/llvm_patches/BUILD b/bazel/patches/llvm/BUILD similarity index 100% rename from bazel/llvm_patches/BUILD rename to bazel/patches/llvm/BUILD