clang: build with static analizer (default and needed for clang-tools-extra); remove clang-static-analyzer

4 files changed, 25 insertions, 9 deletions

diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 55161095a1e..bf757be4cf8 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.56 2020/06/02 08:22:45 adam Exp $
+# $NetBSD: Makefile,v 1.57 2020/07/01 14:46:37 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	2
-
-CMAKE_ARGS+=	-DCLANG_ENABLE_STATIC_ANALYZER=OFF
+PKGREVISION=	3
 
 PYTHON_FOR_BUILD_ONLY=	yes
 
diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common
index d638a41d35f..ef4f539f323 100644
--- a/lang/clang/Makefile.common
+++ b/lang/clang/Makefile.common
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.common,v 1.44 2020/05/07 20:21:41 rillig Exp $
+# $NetBSD: Makefile.common,v 1.45 2020/07/01 14:46:37 adam Exp $
 # used by lang/clang/Makefile
-# used by lang/clang-static-analyzer/Makefile
 # used by lang/clang-tools-extra/Makefile
 
 .include "../../lang/llvm/version.mk"
@@ -24,8 +23,6 @@ CMAKE_ARGS+=	-DLLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DCMAKE_C_COMPILER=${CC:Q}
 CMAKE_ARGS+=	-DCMAKE_CXX_COMPILER=${CXX:Q}
-# XXX can't disable static-analyzer without also disabling ARCMT
-CMAKE_ARGS+=	-DCLANG_ENABLE_ARCMT=OFF
 
 .include "../../mk/compiler.mk"
 
diff --git a/lang/clang/PLIST b/lang/clang/PLIST
index b9168bea8ad..848e8027a79 100644
--- a/lang/clang/PLIST
+++ b/lang/clang/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.29 2020/04/18 10:49:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2020/07/01 14:46:37 adam Exp $
 bin/c-index-test
 bin/clang
 bin/clang++
 bin/clang-10
+bin/clang-check
 bin/clang-cl
 bin/clang-cpp
+bin/clang-extdef-mapping
 bin/clang-format
 bin/clang-import-test
 bin/clang-offload-bundler
@@ -15,6 +17,8 @@ bin/clang-scan-deps
 bin/diagtool
 bin/git-clang-format
 bin/hmaptool
+bin/scan-build
+bin/scan-view
 include/clang-c/BuildSystem.h
 include/clang-c/CXCompilationDatabase.h
 include/clang-c/CXErrorCode.h
@@ -773,6 +777,7 @@ lib/libclang-cpp.${SOEXT}
 ${PLIST.notdylib}lib/libclang-cpp.${SOEXT}.10
 lib/libclang.${SOEXT}
 ${PLIST.notdylib}lib/libclang.${SOEXT}.10
+lib/libclangARCMigrate.a
 lib/libclangAST.a
 lib/libclangASTMatchers.a
 lib/libclangAnalysis.a
@@ -796,6 +801,9 @@ lib/libclangRewrite.a
 lib/libclangRewriteFrontend.a
 lib/libclangSema.a
 lib/libclangSerialization.a
+lib/libclangStaticAnalyzerCheckers.a
+lib/libclangStaticAnalyzerCore.a
+lib/libclangStaticAnalyzerFrontend.a
 lib/libclangTooling.a
 lib/libclangToolingASTDiff.a
 lib/libclangToolingCore.a
@@ -803,6 +811,9 @@ lib/libclangToolingInclusions.a
 lib/libclangToolingRefactoring.a
 lib/libclangToolingSyntax.a
 lib/libclangTransformer.a
+libexec/c++-analyzer
+libexec/ccc-analyzer
+man/man1/scan-build.1
 share/clang/bash-autocomplete.sh
 share/clang/clang-format-bbedit.applescript
 share/clang/clang-format-diff.py
@@ -811,3 +822,11 @@ share/clang/clang-format.el
 share/clang/clang-format.py
 share/clang/clang-rename.el
 share/clang/clang-rename.py
+share/scan-build/scanview.css
+share/scan-build/sorttable.js
+share/scan-view/FileRadar.scpt
+share/scan-view/GetRadarVersion.scpt
+share/scan-view/Reporter.py
+share/scan-view/ScanView.py
+share/scan-view/bugcatcher.ico
+share/scan-view/startfile.py
diff --git a/lang/clang/PLIST.Darwin b/lang/clang/PLIST.Darwin
new file mode 100644
index 00000000000..73b4f294993
--- /dev/null
+++ b/lang/clang/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Darwin,v 1.5 2020/07/01 14:46:37 adam Exp $
+bin/set-xcode-analyzer