Fix dependencies now that the ARC migrator depends on the static analyzer.
Thanks for pointing this out, Stephen. I think this is right now -- I
attempted to try all four valid combinations with both the autoconf and
CMake builds.
See also LLVM changes to the configure script.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@189027 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/tools/Makefile b/tools/Makefile
index dddc07b..8cd0a06 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -11,11 +11,16 @@
include $(CLANG_LEVEL)/../../Makefile.config
-DIRS := libclang c-index-test arcmt-test c-arcmt-test
-PARALLEL_DIRS := driver diagtool clang-format
+DIRS :=
+PARALLEL_DIRS := driver diagtool
-ifeq ($(ENABLE_CLANG_STATIC_ANALYZER),1)
- PARALLEL_DIRS += clang-check
+ifeq ($(ENABLE_CLANG_REWRITER),1)
+ PARALLEL_DIRS += clang-format
+endif
+
+ifeq ($(ENABLE_CLANG_ARCMT), 1)
+ DIRS += libclang c-index-test c-arcmt-test
+ PARALLEL_DIRS += arcmt-test
endif
# Recurse into the extra repository of tools if present.