fix the patch

This commit is contained in:
Sylvestre Ledru 2022-01-12 22:09:12 +01:00
parent d7a17e8cae
commit eda4bcc85d
2 changed files with 4 additions and 4 deletions

View File

@ -9,9 +9,9 @@ Index: llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c/clang/CMakeLists
- -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${CXX_COMPILER}
- -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER}
- -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER}
+ -DCMAKE_CXX_COMPILER=/usr/share/clang/scan-build-${LLVM_PACKAGE_VERSION}/libexec/c++-analyzer
+ -DCMAKE_C_COMPILER=/usr/share/clang/scan-build-${LLVM_PACKAGE_VERSION}/libexec/ccc-analyzer
+ -DCMAKE_ASM_COMPILER=/usr/share/clang/scan-build-${LLVM_PACKAGE_VERSION}/libexec/ccc-analyzer
+ -DCMAKE_CXX_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/c++-analyzer
+ -DCMAKE_C_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/ccc-analyzer
+ -DCMAKE_ASM_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/ccc-analyzer
-DCMAKE_ASM_COMPILER_ID=Clang)
# cmake requires CMAKE_LINKER to be specified if the compiler is MSVC-like,

2
debian/rules vendored
View File

@ -461,7 +461,7 @@ override_dh_auto_configure: preconfigure
sed -e "s|@DEB_PATCHSETVERSION@|$(DEBIAN_REVISION)|" \
debian/debian_path.h > clang/include/clang/Debian/debian_path.h
if test "$(SCAN_BUILD)" = "yes"; then \
patch -f -p1 < debian/patches/on-the-fly/use-scan-build-runtimes.diff; \
patch -f -p1 < debian/patches/on-the-fly/use-scan-build-runtimes.diff||true; \
fi
# Configure coverity (we need the compilers) + work around perf issues