Skip to content

Commit

Permalink
clang: move clang-check back to clang package.
Browse files Browse the repository at this point in the history
and clang-extdef-mapping.

I had moved them to clang-analyzer but clang's cmake files reference
them, and require them to be present if building a cmake project that
uses clang.

Remove makedepends on clang-analyzer from lldb which was added just for
that cmake requirement.
  • Loading branch information
jeremyd2019 committed Oct 31, 2021
1 parent 976da12 commit 345fe43
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions mingw-w64-clang/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ build() {
# -i.orig to check what has been removed in-case it starts dropping more than it should
#
sed -i.orig '/\(clang\|lld\)\/cmake_install.cmake/d' tools/cmake_install.cmake
sed -i.orig '/\(clang-check\|clang-extdef-mapping\|extra\|scan-build\|scan-build-py\|scan-view\)\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
sed -i.orig '/\(extra\|scan-build\|scan-build-py\|scan-view\)\/cmake_install.cmake/d' tools/clang/tools/cmake_install.cmake
sed -i.orig '/compiler-rt\/cmake_install.cmake/d' projects/cmake_install.cmake
}

Expand Down Expand Up @@ -287,7 +287,7 @@ package_clang-analyzer() {
"${MINGW_PACKAGE_PREFIX}-python")

local _analyzer
for _analyzer in clang-check clang-extdef-mapping scan-build scan-build-py scan-view; do
for _analyzer in scan-build scan-build-py scan-view; do
DESTDIR="${pkgdir}" cmake --install "${srcdir}/build-${MSYSTEM}/tools/clang/tools/${_analyzer}"
done

Expand Down
3 changes: 1 addition & 2 deletions mingw-w64-lldb/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-python-sphinx"
"${MINGW_PACKAGE_PREFIX}-swig"
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
"${MINGW_PACKAGE_PREFIX}-clang-analyzer")
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra")
options=('!debug' 'strip')
_url=https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}
_pkgfn=$_realname-$pkgver.src
Expand Down

0 comments on commit 345fe43

Please sign in to comment.