diff options
| author | Adrian Prantl <aprantl@apple.com> | 2015-07-07 23:19:46 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2015-07-07 23:19:46 +0000 |
| commit | 142ec39739ce2cdfaea28407f916e241bbd4c43c (patch) | |
| tree | fac664158611309a7d6b6387df4b0835d1fe0e50 /clang/tools/libclang | |
| parent | 3d43f66c9157278210ac7fb6d36664ecd8219fee (diff) | |
| download | bcm5719-llvm-142ec39739ce2cdfaea28407f916e241bbd4c43c.tar.gz bcm5719-llvm-142ec39739ce2cdfaea28407f916e241bbd4c43c.zip | |
Revert r241620 and follow-up commits while investigating linux buildbot failures.
llvm-svn: 241642
Diffstat (limited to 'clang/tools/libclang')
| -rw-r--r-- | clang/tools/libclang/CIndex.cpp | 4 | ||||
| -rw-r--r-- | clang/tools/libclang/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | clang/tools/libclang/Makefile | 8 |
3 files changed, 4 insertions, 13 deletions
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index a5a9bbbb45f..df0ed2ad65d 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -29,7 +29,6 @@ #include "clang/Basic/DiagnosticIDs.h" #include "clang/Basic/TargetInfo.h" #include "clang/Basic/Version.h" -#include "clang/CodeGen/ObjectFilePCHContainerOperations.h" #include "clang/Frontend/ASTUnit.h" #include "clang/Frontend/CompilerInstance.h" #include "clang/Frontend/FrontendDiagnostic.h" @@ -2877,8 +2876,7 @@ CXIndex clang_createIndex(int excludeDeclarationsFromPCH, // registered once. (void)*RegisterFatalErrorHandlerOnce; - CIndexer *CIdxr = - new CIndexer(std::make_shared<ObjectFilePCHContainerOperations>()); + CIndexer *CIdxr = new CIndexer(); if (excludeDeclarationsFromPCH) CIdxr->setOnlyLocalDecls(); if (displayDiagnostics) diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index 407a5c4d4e7..26f88a97c57 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -37,14 +37,9 @@ set(SOURCES ../../include/clang-c/Index.h ) -set( LLVM_LINK_COMPONENTS - ${LLVM_TARGETS_TO_BUILD} - ) - set(LIBS clangAST clangBasic - clangCodeGen clangFrontend clangIndex clangLex diff --git a/clang/tools/libclang/Makefile b/clang/tools/libclang/Makefile index 84914e0f460..97f663cde47 100644 --- a/clang/tools/libclang/Makefile +++ b/clang/tools/libclang/Makefile @@ -16,21 +16,19 @@ LINK_LIBS_IN_SHARED = 1 SHARED_LIBRARY = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter core \ - instrumentation ipo mc mcparser objcarcopts option support \ - object +LINK_COMPONENTS := AsmParser BitReader Core MC MCParser Option Support USEDLIBS = clangIndex.a clangARCMigrate.a \ clangRewriteFrontend.a \ clangFormat.a \ clangTooling.a clangToolingCore.a \ - clangFrontend.a clangCodeGen.a clangDriver.a \ + clangFrontend.a clangDriver.a \ clangSerialization.a \ clangParse.a clangSema.a \ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a \ clangRewrite.a \ clangAnalysis.a clangEdit.a \ clangASTMatchers.a \ - clangAST.a clangLex.a clangBasic.a + clangAST.a clangLex.a clangBasic.a \ include $(CLANG_LEVEL)/Makefile |
