From: NAKAMURA Takumi Date: Mon, 4 Apr 2016 15:30:44 +0000 (+0000) Subject: AnnotateFunctions: Tweak for mingw. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c6cec24fd854608b7d028265c3cda8184b09639;p=clang AnnotateFunctions: Tweak for mingw. - Externalize the registry. - Update libdeps. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@265301 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/examples/AnnotateFunctions/CMakeLists.txt b/examples/AnnotateFunctions/CMakeLists.txt index 5aa6a9064c..10e16f254d 100644 --- a/examples/AnnotateFunctions/CMakeLists.txt +++ b/examples/AnnotateFunctions/CMakeLists.txt @@ -3,7 +3,9 @@ add_llvm_loadable_module(AnnotateFunctions AnnotateFunctions.cpp) if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN)) target_link_libraries(AnnotateFunctions ${cmake_2_8_12_PRIVATE} clangAST + clangBasic clangFrontend + clangLex LLVMSupport ) endif() diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h index f7a9ea9518..817c09fcdb 100644 --- a/include/clang/Lex/Preprocessor.h +++ b/include/clang/Lex/Preprocessor.h @@ -1943,4 +1943,6 @@ typedef llvm::Registry PragmaHandlerRegistry; } // end namespace clang +extern template class llvm::Registry; + #endif diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index 70b992170c..297b556015 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -53,6 +53,8 @@ #include "llvm/Support/raw_ostream.h" using namespace clang; +template class llvm::Registry; + //===----------------------------------------------------------------------===// ExternalPreprocessorSource::~ExternalPreprocessorSource() { }