diff options
| author | Jordan Rose <jordan_rose@apple.com> | 2013-08-22 15:50:02 +0000 |
|---|---|---|
| committer | Jordan Rose <jordan_rose@apple.com> | 2013-08-22 15:50:02 +0000 |
| commit | e638503d0dba2c02ab5254fe40d4e5385c3bf2a9 (patch) | |
| tree | 09871abcb30d55c3523da2d866f78f66e276a581 /lib | |
| parent | 6a29f674f649197780a4c60602cd08f491022ac8 (diff) | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/FrontendTool/CMakeLists.txt | 7 | ||||
| -rwxr-xr-x | lib/Makefile | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 6df8ebcce6..7bb65e923e 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -11,7 +11,9 @@ add_subdirectory(CodeGen) add_subdirectory(Analysis) add_subdirectory(Edit) add_subdirectory(Rewrite) -add_subdirectory(ARCMigrate) +if(CLANG_ENABLE_ARCMT) + add_subdirectory(ARCMigrate) +endif() add_subdirectory(Driver) add_subdirectory(Serialization) add_subdirectory(Frontend) diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt index 3e6aba441e..28a864a633 100644 --- a/lib/FrontendTool/CMakeLists.txt +++ b/lib/FrontendTool/CMakeLists.txt @@ -14,9 +14,14 @@ target_link_libraries(clangFrontendTool clangRewriteCore clangRewriteFrontend clangCodeGen - clangARCMigrate ) +if(CLANG_ENABLE_ARCMT) + target_link_libraries(clangFrontendTool + clangARCMigrate + ) +endif() + if(CLANG_ENABLE_STATIC_ANALYZER) target_link_libraries(clangFrontendTool clangStaticAnalyzerFrontend diff --git a/lib/Makefile b/lib/Makefile index 57125273c5..66632688d9 100755 --- a/lib/Makefile +++ b/lib/Makefile @@ -10,8 +10,8 @@ CLANG_LEVEL := .. # ARCMigrate and Rewrite are always needed because of libclang. PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Frontend \ - FrontendTool Tooling Driver Format Edit ARCMigrate Rewrite \ - Serialization Index + FrontendTool Tooling Driver Format Edit Rewrite Serialization \ + Index include $(CLANG_LEVEL)/../../Makefile.config @@ -23,4 +23,8 @@ ifeq ($(ENABLE_CLANG_STATIC_ANALYZER),1) PARALLEL_DIRS += StaticAnalyzer endif +ifeq ($(ENABLE_CLANG_ARCMT),1) +PARALLEL_DIRS += ARCMigrate +endif + include $(CLANG_LEVEL)/Makefile |