From 77553c72dc00ed57d87b6d0788ac602ab353dc33 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Tue, 24 Feb 2015 05:14:37 +0000 Subject: [PATCH] Revert "Add clangCodeGen.a to the tools that need it after the clang module" llvm-svn: 230310 --- clang-tools-extra/clang-modernize/tool/Makefile | 5 ++--- clang-tools-extra/remove-cstr-calls/Makefile | 3 +-- clang-tools-extra/tool-template/Makefile | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/clang-tools-extra/clang-modernize/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile index 36c871c..efc3613 100644 --- a/clang-tools-extra/clang-modernize/tool/Makefile +++ b/clang-tools-extra/clang-modernize/tool/Makefile @@ -35,10 +35,9 @@ BUILT_SOURCES += $(ObjDir)/../PassByValue/.objdir SOURCES += $(addprefix ../ReplaceAutoPtr/,$(notdir $(wildcard $(PROJ_SRC_DIR)/../ReplaceAutoPtr/*.cpp))) BUILT_SOURCES += $(ObjDir)/../ReplaceAutoPtr/.objdir -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ - instrumentation bitwriter support mc option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option USEDLIBS = modernizeCore.a clangFormat.a \ - clangTooling.a clangToolingCore.a clangFrontend.a clangCodeGen.a \ + clangTooling.a clangToolingCore.a clangFrontend.a \ clangSerialization.a clangDriver.a clangRewriteFrontend.a \ clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a diff --git a/clang-tools-extra/remove-cstr-calls/Makefile b/clang-tools-extra/remove-cstr-calls/Makefile index dd888ff..b4110c1 100644 --- a/clang-tools-extra/remove-cstr-calls/Makefile +++ b/clang-tools-extra/remove-cstr-calls/Makefile @@ -17,8 +17,7 @@ TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option -USEDLIBS = clangTooling.a clangFrontend.a clangCodeGen.a \ - clangSerialization.a clangDriver.a \ +USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ clangToolingCore.a clangRewriteFrontend.a clangRewrite.a \ clangParse.a clangSema.a clangAnalysis.a \ clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a diff --git a/clang-tools-extra/tool-template/Makefile b/clang-tools-extra/tool-template/Makefile index bd3f11f..8a461e4 100644 --- a/clang-tools-extra/tool-template/Makefile +++ b/clang-tools-extra/tool-template/Makefile @@ -16,10 +16,8 @@ NO_INSTALL = 1 TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader ipo objcarcopts \ - instrumentation bitcodewriter support mc option -USEDLIBS = clangTooling.a clangFrontend.a clangCodeGen.a \ - clangSerialization.a clangDriver.a \ +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option +USEDLIBS = clangTooling.a clangFrontend.a clangSerialization.a clangDriver.a \ clangRewriteFrontend.a clangToolingCore.a clangRewrite.a \ clangParse.a clangSema.a clangAnalysis.a \ clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a -- 2.7.4