Author: Sam McCall Date: 2021-07-02T16:29:48+02:00 New Revision: 33ff8078ff744cb317ec8806c990a52d33310834
URL: https://github.com/llvm/llvm-project/commit/33ff8078ff744cb317ec8806c990a52d33310834 DIFF: https://github.com/llvm/llvm-project/commit/33ff8078ff744cb317ec8806c990a52d33310834.diff LOG: Revert "[clangd] Unbreak mac build differently 0c96a92d8666b8" This reverts commit 2f79acb7b701c41494abff588b5f03a74ea2e11d. Should no longer be needed after 26e1553a107f52667be879e99739a4153f8799d8 Added: Modified: clang-tools-extra/clangd/Transport.h clang-tools-extra/clangd/tool/ClangdMain.cpp llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/Transport.h b/clang-tools-extra/clangd/Transport.h index ae6da722d91b1..b3db4eba85f93 100644 --- a/clang-tools-extra/clangd/Transport.h +++ b/clang-tools-extra/clangd/Transport.h @@ -18,6 +18,7 @@ #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_TRANSPORT_H_ #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_TRANSPORT_H_ +#include "Features.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/JSON.h" #include "llvm/Support/raw_ostream.h" diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp index c03dd927970d4..8db52c65061c8 100644 --- a/clang-tools-extra/clangd/tool/ClangdMain.cpp +++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp @@ -6,13 +6,11 @@ // //===----------------------------------------------------------------------===// -// Must be before Transport.h include. -#include "Features.h" - #include "ClangdLSPServer.h" #include "CodeComplete.h" #include "Config.h" #include "ConfigProvider.h" +#include "Features.h" #include "PathMapping.h" #include "Protocol.h" #include "TidyProvider.h" diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn index 0d375392ae257..921e0dbedeb54 100644 --- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn +++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/xpc/BUILD.gn @@ -16,6 +16,7 @@ static_library("transport") { deps = [ ":conversions", "//clang-tools-extra/clangd", + "//clang-tools-extra/clangd:features", "//clang-tools-extra/clangd/support", "//llvm/lib/Support", ] _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
