c-arcmt-test, c-index-test: Appease Cygwin, to link to libclang.a, not clang.dll.

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

diff --git a/tools/c-arcmt-test/Makefile b/tools/c-arcmt-test/Makefile
index 818f648872d1567f7a9e501aad3c9f16b2227eb9..b59afdac16dab715598a7c7b4341b4651a05e66c 100644 (file)
--- a/tools/c-arcmt-test/Makefile
+++ b/tools/c-arcmt-test/Makefile
@@ -16,7 +16,12 @@ TOOL_NO_EXPORTS = 1
 # Don't install this. It is used for tests.
 NO_INSTALL = 1
 
-LINK_COMPONENTS := support mc
+# 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 support mc
 USEDLIBS = clang.a clangARCMigrate.a clangRewrite.a \
           clangFrontend.a clangDriver.a \
           clangSerialization.a clangParse.a clangSema.a \

diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index eb4d7de271ae62b6f62bc9a2e9082ffdcdd0f3e6..09eff0f095e632ed35671bec2706c4016a1b715b 100644 (file)
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -20,7 +20,12 @@ TOOL_NO_EXPORTS = 1
 # Don't install this. It is used for tests.
 NO_INSTALL = 1
 
-LINK_COMPONENTS := support mc
+# 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 support mc
 USEDLIBS = clang.a clangFrontend.a clangDriver.a \
           clangTooling.a \
           clangSerialization.a clangParse.a clangSema.a \