Build fixes for r72060; sorry for any inconvenience.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72062 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/clang-cc/DiagChecker.cpp b/tools/clang-cc/DiagChecker.cpp
index 3482d12280413c511703a0df8f7fff18a9e5fdf5..5e964dcfb7acf9dc8cc1275941b5d2258f6ac82f 100644 (file)
--- a/tools/clang-cc/DiagChecker.cpp
+++ b/tools/clang-cc/DiagChecker.cpp
@@ -12,7 +12,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-cc.h"
-#include "ASTConsumers.h"
 #include "clang/Frontend/TextDiagnosticBuffer.h"
 #include "clang/Sema/ParseAST.h"
 #include "clang/AST/ASTConsumer.h"

diff --git a/tools/clang-cc/Makefile b/tools/clang-cc/Makefile
index d86ce7efbd654a8dda14ace65c3fec0c40f6a512..874a42fc191383736b21db9021413aaf9015ca14 100644 (file)
--- a/tools/clang-cc/Makefile
+++ b/tools/clang-cc/Makefile
@@ -21,9 +21,9 @@ TOOL_NO_EXPORTS = 1
 include $(LEVEL)/Makefile.config
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) bitreader bitwriter codegen ipo selectiondag
-USEDLIBS = clangCodeGen.a clangAnalysis.a clangRewrite.a clangSema.a   \
-           clangFrontend.a clangAST.a clangParse.a clangLex.a          \
-           clangBasic.a 
+USEDLIBS = clangFrontend.a clangCodeGen.a clangAnalysis.a      \
+           clangRewrite.a clangSema.a clangAST.a clangParse.a          \
+           clangLex.a clangBasic.a 
 
 # clang-cc lives in a special location; we can get away with this
 # because nothing else gets installed from here.

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index fdc370e22f07d9f5032e48e9108d214b626d9eb1..767ae141488210146a67248383648fac06095403 100644 (file)
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -23,7 +23,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-cc.h"
-#include "ASTConsumers.h"
+#include "clang/Frontend/ASTConsumers.h"
 #include "clang/Frontend/CompileOptions.h"
 #include "clang/Frontend/FixItRewriter.h"
 #include "clang/Frontend/FrontendDiagnostic.h"