diff options
Diffstat (limited to 'clang/tools')
| -rw-r--r-- | clang/tools/c-index-test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | clang/tools/c-index-test/Makefile | 2 | ||||
| -rw-r--r-- | clang/tools/driver/cc1_main.cpp | 3 | ||||
| -rw-r--r-- | clang/tools/libclang/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | clang/tools/libclang/Makefile | 2 |
5 files changed, 4 insertions, 9 deletions
diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt index 9169fc7422a..45ad9e35c6e 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt @@ -1,9 +1,8 @@ set(LLVM_USED_LIBS libclang) set( LLVM_LINK_COMPONENTS - bitreader + support mc - core ) add_clang_executable(c-index-test diff --git a/clang/tools/c-index-test/Makefile b/clang/tools/c-index-test/Makefile index f41aa809815..3d9849a3a40 100644 --- a/clang/tools/c-index-test/Makefile +++ b/clang/tools/c-index-test/Makefile @@ -13,7 +13,7 @@ TOOLNAME = c-index-test # No plugins, optimize startup time. TOOL_NO_EXPORTS = 1 -LINK_COMPONENTS := bitreader mc core +LINK_COMPONENTS := support mc USEDLIBS = clang.a clangIndex.a clangFrontend.a clangDriver.a \ clangSerialization.a clangParse.a clangSema.a clangAnalysis.a \ clangAST.a clangLex.a clangBasic.a diff --git a/clang/tools/driver/cc1_main.cpp b/clang/tools/driver/cc1_main.cpp index 1f8d1129dad..7fb394fa5b0 100644 --- a/clang/tools/driver/cc1_main.cpp +++ b/clang/tools/driver/cc1_main.cpp @@ -24,7 +24,6 @@ #include "clang/Frontend/TextDiagnosticBuffer.h" #include "clang/Frontend/TextDiagnosticPrinter.h" #include "clang/FrontendTool/Utils.h" -#include "llvm/LLVMContext.h" #include "llvm/ADT/Statistic.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ManagedStatic.h" @@ -118,8 +117,6 @@ int cc1_main(const char **ArgBegin, const char **ArgEnd, llvm::OwningPtr<CompilerInstance> Clang(new CompilerInstance()); llvm::IntrusiveRefCntPtr<DiagnosticIDs> DiagID(new DiagnosticIDs()); - Clang->setLLVMContext(new llvm::LLVMContext()); - // Run clang -cc1 test. if (ArgBegin != ArgEnd && llvm::StringRef(ArgBegin[0]) == "-cc1test") { Diagnostic Diags(DiagID, new TextDiagnosticPrinter(llvm::errs(), diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index 661fddd822e..da72f5a02d0 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -11,9 +11,8 @@ set(LLVM_USED_LIBS clangBasic) set( LLVM_LINK_COMPONENTS - bitreader + support mc - core ) add_clang_library(libclang diff --git a/clang/tools/libclang/Makefile b/clang/tools/libclang/Makefile index 6d2a13cfc0b..e684652aa4c 100644 --- a/clang/tools/libclang/Makefile +++ b/clang/tools/libclang/Makefile @@ -15,7 +15,7 @@ EXPORTED_SYMBOL_FILE = $(PROJ_SRC_DIR)/libclang.exports LINK_LIBS_IN_SHARED = 1 SHARED_LIBRARY = 1 -LINK_COMPONENTS := bitreader mc core +LINK_COMPONENTS := support mc USEDLIBS = clangFrontend.a clangDriver.a clangSerialization.a clangParse.a \ clangSema.a clangAnalysis.a clangAST.a clangLex.a clangBasic.a |
