replace upstream fix for CompletionModelCodegen.py with one that actually works

diff --git a/llvm12-build_fixes.patch b/llvm12-build_fixes.patch
index 82059619602b2a4ccfeef5826657fba0aa4f571b..039f03784ce14d6e82d10aab40836e66122efb4d 100644 (file)
--- a/llvm12-build_fixes.patch
+++ b/llvm12-build_fixes.patch
@@ -1,33 +1,15 @@
-From f51ab1871655a9a96134c2636c37dcb5a6b01ac3 Mon Sep 17 00:00:00 2001
-From: serge-sans-paille <sguelton@redhat.com>
-Date: Mon, 22 Mar 2021 10:05:25 +0100
-Subject: [PATCH] Make clangd CompletionModel usable even with non-standard
- (but supported) layout
-
-llvm supports specifying a non-standard layout where each project lies in its
-own place. Do not assume a fixed layout and use the appropriate cmake variable
-instead.
-
-Differential Revision: https://reviews.llvm.org/D96787
----
- clang-tools-extra/clangd/quality/CompletionModel.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/clang-tools-extra/clangd/quality/CompletionModel.cmake b/clang-tools-extra/clangd/quality/CompletionModel.cmake
-index 60c6d2aa84330..41bc2ed1890b0 100644
---- a/tools/clang/tools/extra/clangd/quality/CompletionModel.cmake
-+++ b/tools/clang/tools/extra/clangd/quality/CompletionModel.cmake
-@@ -5,8 +5,8 @@
+--- llvm-12.0.0.src/tools/clang/tools/extra/clangd/quality/CompletionModel.cmake.orig  2021-04-06 18:38:18.000000000 +0200
++++ llvm-12.0.0.src/tools/clang/tools/extra/clangd/quality/CompletionModel.cmake       2021-04-18 18:45:47.412730844 +0200
+@@ -4,8 +4,8 @@
+ # ${CMAKE_CURRENT_BINARY_DIR}. The generated header
  # will define a C++ class called ${cpp_class} - which may be a
  # namespace-qualified class name.
++set(model_compiler ${CMAKE_CURRENT_LIST_DIR}/CompletionModelCodegen.py)
  function(gen_decision_forest model filename cpp_class)
 -  set(model_compiler ${CMAKE_SOURCE_DIR}/../clang-tools-extra/clangd/quality/CompletionModelCodegen.py)
--  
-+  set(model_compiler ${LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR}/clangd/quality/CompletionModelCodegen.py)
-+
+   
    set(output_dir ${CMAKE_CURRENT_BINARY_DIR})
    set(header_file ${output_dir}/${filename}.h)
-   set(cpp_file ${output_dir}/${filename}.cpp)
 diff -urN llvm-12.0.0.src.orig/tools/lld/MachO/mach-o/compact_unwind_encoding.h llvm-12.0.0.src/tools/lld/MachO/mach-o/compact_unwind_encoding.h
 --- llvm-12.0.0.src.orig/tools/lld/MachO/mach-o/compact_unwind_encoding.h      1970-01-01 01:00:00.000000000 +0100
 +++ llvm-12.0.0.src/tools/lld/MachO/mach-o/compact_unwind_encoding.h   2021-04-16 16:24:55.701577683 +0200