diff options
| author | Android Merger <noreply-android-build-merger@google.com> | 2018-11-23 15:19:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-23 15:19:30 +0000 |
| commit | 0334ae02aed01c6835e96b6adaa3e5215f02c53d (patch) | |
| tree | 7a32ce3889201a7470ceeba72395b09b57534edd | |
| parent | fdb04e68b5cff38f470baab1e8d4032b54461909 (diff) | |
| parent | 9ae9c33851b08b1bd6e3bd643617e4e8e9fa69bb (diff) | |
| download | clang-0334ae02aed01c6835e96b6adaa3e5215f02c53d.tar.gz | |
Merge "Remove the optional dependency from libclang to clang-tidy/include-fixer am: 67aa4f1ec5" into lldb-master-dev
| -rw-r--r-- | tools/libclang/CIndex.cpp | 13 | ||||
| -rw-r--r-- | tools/libclang/CMakeLists.txt | 9 |
2 files changed, 0 insertions, 22 deletions
diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index e9bc393971..03208bb5a4 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -8938,16 +8938,3 @@ cxindex::Logger::~Logger() { OS << "--------------------------------------------------\n"; } } - -#ifdef CLANG_TOOL_EXTRA_BUILD -// This anchor is used to force the linker to link the clang-tidy plugin. -extern volatile int ClangTidyPluginAnchorSource; -static int LLVM_ATTRIBUTE_UNUSED ClangTidyPluginAnchorDestination = - ClangTidyPluginAnchorSource; - -// This anchor is used to force the linker to link the clang-include-fixer -// plugin. -extern volatile int ClangIncludeFixerPluginAnchorSource; -static int LLVM_ATTRIBUTE_UNUSED ClangIncludeFixerPluginAnchorDestination = - ClangIncludeFixerPluginAnchorSource; -#endif diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt index 729d5560b6..17ba0a0845 100644 --- a/tools/libclang/CMakeLists.txt +++ b/tools/libclang/CMakeLists.txt @@ -47,15 +47,6 @@ if (CLANG_ENABLE_ARCMT) list(APPEND LIBS clangARCMigrate) endif () -if (TARGET clangTidyPlugin) - add_definitions(-DCLANG_TOOL_EXTRA_BUILD) - list(APPEND LIBS clangTidyPlugin) - list(APPEND LIBS clangIncludeFixerPlugin) - if(LLVM_ENABLE_MODULES) - list(APPEND LLVM_COMPILE_FLAGS "-fmodules-ignore-macro=CLANG_TOOL_EXTRA_BUILD") - endif() -endif () - find_library(DL_LIBRARY_PATH dl) if (DL_LIBRARY_PATH) list(APPEND LIBS dl) |