diff --git a/clang-tools-extra/clang-apply-replacements/tool/Makefile b/clang-tools-extra/clang-apply-replacements/tool/Makefile index 8c911720ebde..7d0de340b3d1 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/Makefile +++ b/clang-tools-extra/clang-apply-replacements/tool/Makefile @@ -17,12 +17,19 @@ TOOL_NO_EXPORTS = 1 SOURCES = ClangApplyReplacementsMain.cpp -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option +# Include this here so we can get the configuration of the targets that have +# been configured for construction. We have to do this early so we can set up +# LINK_COMPONENTS before including Makefile.rules +include $(CLANG_LEVEL)/../../Makefile.config + +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts option USEDLIBS = clangApplyReplacements.a clangFormat.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 + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/clang-modernize/tool/Makefile b/clang-tools-extra/clang-modernize/tool/Makefile index efc361343ff6..74f58eea1d55 100644 --- a/clang-tools-extra/clang-modernize/tool/Makefile +++ b/clang-tools-extra/clang-modernize/tool/Makefile @@ -35,12 +35,15 @@ 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 support mc mcparser option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts option + USEDLIBS = modernizeCore.a clangFormat.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 + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/clang-query/tool/Makefile b/clang-tools-extra/clang-query/tool/Makefile index f62b0b541313..f2b136004a6a 100644 --- a/clang-tools-extra/clang-query/tool/Makefile +++ b/clang-tools-extra/clang-query/tool/Makefile @@ -17,11 +17,13 @@ TOOL_NO_EXPORTS = 1 SOURCES = ClangQuery.cpp -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc mcparser option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts option USEDLIBS = clangQuery.a clangDynamicASTMatchers.a clangFormat.a clangTooling.a \ clangFrontend.a clangSerialization.a clangDriver.a clangRewriteFrontend.a \ LLVMLineEditor.a clangRewrite.a clangParse.a clangSema.a clangAnalysis.a \ - clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/clang-rename/tool/Makefile b/clang-tools-extra/clang-rename/tool/Makefile index b3d9555f37b7..db933fd607fe 100644 --- a/clang-tools-extra/clang-rename/tool/Makefile +++ b/clang-tools-extra/clang-rename/tool/Makefile @@ -1,13 +1,20 @@ CLANG_LEVEL := ../../../.. TOOLNAME = clang-rename include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option +# Include this here so we can get the configuration of the targets that have +# been configured for construction. We have to do this early so we can set up +# LINK_COMPONENTS before including Makefile.rules +include $(CLANG_LEVEL)/../../Makefile.config + +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts option USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \ clangTooling.a clangToolingCore.a \ clangParse.a clangSema.a clangIndex.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \ - clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a + clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/clang-tidy/tool/Makefile b/clang-tools-extra/clang-tidy/tool/Makefile index f2d83ebf2292..da502775d0a3 100644 --- a/clang-tools-extra/clang-tidy/tool/Makefile +++ b/clang-tools-extra/clang-tidy/tool/Makefile @@ -15,7 +15,8 @@ TOOLNAME = clang-tidy TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts option USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ clangTidyMiscModule.a clangTidyReadability.a clangTidyUtils.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ @@ -23,6 +24,6 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ clangFormat.a clangASTMatchers.a clangTooling.a clangToolingCore.a \ clangFrontend.a clangSerialization.a clangDriver.a clangParse.a \ clangSema.a clangAnalysis.a clangRewriteFrontend.a clangRewrite.a \ - clangEdit.a clangAST.a clangLex.a clangBasic.a + clangEdit.a clangAST.a clangLex.a clangBasic.a clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/modularize/Makefile b/clang-tools-extra/modularize/Makefile index f96540b751dc..e702c0690436 100644 --- a/clang-tools-extra/modularize/Makefile +++ b/clang-tools-extra/modularize/Makefile @@ -15,10 +15,17 @@ NO_INSTALL = 0 # No plugins, optimize startup time. TOOL_NO_EXPORTS = 1 -LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils +# Include this here so we can get the configuration of the targets that have +# been configured for construction. We have to do this early so we can set up +# LINK_COMPONENTS before including Makefile.rules +include $(CLANG_LEVEL)/../../Makefile.config + +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option + USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ clangTooling.a clangParse.a clangSema.a clangAnalysis.a \ - clangEdit.a clangAST.a clangLex.a clangBasic.a + clangEdit.a clangAST.a clangLex.a clangBasic.a clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/pp-trace/Makefile b/clang-tools-extra/pp-trace/Makefile index 3467ecb31f47..a4a277acc673 100644 --- a/clang-tools-extra/pp-trace/Makefile +++ b/clang-tools-extra/pp-trace/Makefile @@ -14,9 +14,16 @@ TOOLNAME = pp-trace # No plugins, optimize startup time. TOOL_NO_EXPORTS = 1 -LINK_COMPONENTS := mcparser bitreader support mc option TransformUtils +# Include this here so we can get the configuration of the targets that have +# been configured for construction. We have to do this early so we can set up +# LINK_COMPONENTS before including Makefile.rules +include $(CLANG_LEVEL)/../../Makefile.config + +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option + USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a \ clangTooling.a clangParse.a clangSema.a clangAnalysis.a \ - clangEdit.a clangAST.a clangLex.a clangBasic.a + clangEdit.a clangAST.a clangLex.a clangBasic.a clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/remove-cstr-calls/Makefile b/clang-tools-extra/remove-cstr-calls/Makefile index b4110c184b8b..d712f4b3e84d 100644 --- a/clang-tools-extra/remove-cstr-calls/Makefile +++ b/clang-tools-extra/remove-cstr-calls/Makefile @@ -16,10 +16,12 @@ NO_INSTALL = 1 TOOL_NO_EXPORTS = 1 include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts option 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 + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/tool-template/Makefile b/clang-tools-extra/tool-template/Makefile index 8a461e4dc7cb..05571f5bc20b 100644 --- a/clang-tools-extra/tool-template/Makefile +++ b/clang-tools-extra/tool-template/Makefile @@ -15,11 +15,16 @@ NO_INSTALL = 1 # No plugins, optimize startup time. TOOL_NO_EXPORTS = 1 +# Include this here so we can get the configuration of the targets that have +# been configured for construction. We have to do this early so we can set up +# LINK_COMPONENTS before including Makefile.rules include $(CLANG_LEVEL)/../../Makefile.config -LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader support mc option +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter \ + instrumentation ipo support mc objcarcopts 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 + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile diff --git a/clang-tools-extra/unittests/clang-apply-replacements/Makefile b/clang-tools-extra/unittests/clang-apply-replacements/Makefile index 61bbf8bd571d..c583d0f83e1f 100644 --- a/clang-tools-extra/unittests/clang-apply-replacements/Makefile +++ b/clang-tools-extra/unittests/clang-apply-replacements/Makefile @@ -11,13 +11,14 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangApplyReplacementsTests -LINK_COMPONENTS := asmparser bitreader support mc mcparser option \ - TransformUtils +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option USEDLIBS = clangApplyReplacements.a clangFormat.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 + clangAST.a clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 diff --git a/clang-tools-extra/unittests/clang-modernize/Makefile b/clang-tools-extra/unittests/clang-modernize/Makefile index 6f7bb16d32c9..c55ff127cd64 100644 --- a/clang-tools-extra/unittests/clang-modernize/Makefile +++ b/clang-tools-extra/unittests/clang-modernize/Makefile @@ -11,14 +11,14 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangModernizeTests -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ - TransformUtils +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option USEDLIBS = modernizeCore.a clangFormat.a clangApplyReplacements.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 + clangBasic.a clangCodeGen.a include $(CLANG_LEVEL)/Makefile MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 diff --git a/clang-tools-extra/unittests/clang-query/Makefile b/clang-tools-extra/unittests/clang-query/Makefile index 2ef1353c0a46..b9426df8104c 100644 --- a/clang-tools-extra/unittests/clang-query/Makefile +++ b/clang-tools-extra/unittests/clang-query/Makefile @@ -11,12 +11,12 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangQuery -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ - TransformUtils +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option USEDLIBS = clangQuery.a clangTooling.a clangFrontend.a clangSerialization.a \ clangDriver.a clangParse.a clangSema.a clangEdit.a clangAnalysis.a \ clangAST.a clangASTMatchers.a clangDynamicASTMatchers.a clangLex.a \ - clangBasic.a + clangBasic.a clangCodeGen.a include $(CLANG_LEVEL)/Makefile MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 diff --git a/clang-tools-extra/unittests/clang-rename/Makefile b/clang-tools-extra/unittests/clang-rename/Makefile index d597e47583fc..2634799fd527 100644 --- a/clang-tools-extra/unittests/clang-rename/Makefile +++ b/clang-tools-extra/unittests/clang-rename/Makefile @@ -11,13 +11,14 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangRenameTests -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ - TransformUtils +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option USEDLIBS = clangRename.a clangFrontend.a clangSerialization.a clangDriver.a \ clangTooling.a clangParse.a clangSema.a clangIndex.a \ clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ clangStaticAnalyzerCore.a clangAnalysis.a clangRewriteFrontend.a \ - clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a + clangRewrite.a clangEdit.a clangAST.a clangLex.a clangBasic.a \ + clangCodeGen.a include $(CLANG_LEVEL)/Makefile MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1 diff --git a/clang-tools-extra/unittests/clang-tidy/Makefile b/clang-tools-extra/unittests/clang-tidy/Makefile index 82a3a27cb655..de651319e34c 100644 --- a/clang-tools-extra/unittests/clang-tidy/Makefile +++ b/clang-tools-extra/unittests/clang-tidy/Makefile @@ -11,8 +11,8 @@ CLANG_LEVEL = ../../../.. include $(CLANG_LEVEL)/../../Makefile.config TESTNAME = ClangTidy -LINK_COMPONENTS := asmparser bitreader support MC MCParser option \ - TransformUtils +LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser mcparser bitreader bitwriter \ + instrumentation ipo support transformutils mc objcarcopts option USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.a \ clangTidyMiscModule.a clangTidyReadability.a clangTidy.a \ clangTidyUtils.a \ @@ -22,7 +22,7 @@ USEDLIBS = clangTidy.a clangTidyLLVMModule.a clangTidyGoogleModule.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 + clangASTMatchers.a clangEdit.a clangLex.a clangBasic.a clangCodeGen.a include $(CLANG_LEVEL)/Makefile MAKEFILE_UNITTEST_NO_INCLUDE_COMMON := 1