Normalize CIndex/c-index-test/index-test link lines in the hopes it will fix

*something*.
 - We really need to fix how LLVM's build systems manage
   linking. Pretty-please-someone-else-do-this? :)

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

6 files changed, 22 insertions, 9 deletions

diff --git a/tools/CIndex/CMakeLists.txt b/tools/CIndex/CMakeLists.txt
index 69de8a1acf..a3ff3db2d9 100644
--- a/tools/CIndex/CMakeLists.txt
+++ b/tools/CIndex/CMakeLists.txt
@@ -3,11 +3,20 @@ set(SHARED_LIBRARY TRUE)
 set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS
-  clangFrontend clangIndex clangSema clangAnalysis clangAST clangParse clangLex clangBasic)
+  clangIndex
+  clangFrontend
+  clangDriver
+  clangSema
+  clangAnalysis
+  clangAST
+  clangParse
+  clangLex
+  clangBasic)
 
 set( LLVM_LINK_COMPONENTS
-  MC
-  support
+  bitreader
+  mc
+  core
   )
 
 add_clang_library(CIndex CIndex.cpp)
diff --git a/tools/CIndex/Makefile b/tools/CIndex/Makefile
index 17e1f3d034..94f0467000 100644
--- a/tools/CIndex/Makefile
+++ b/tools/CIndex/Makefile
@@ -21,8 +21,9 @@ include $(LEVEL)/Makefile.config
 LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
 
-LINK_COMPONENTS := MC support
-USEDLIBS = clangFrontend.a clangDriver.a clangIndex.a clangSema.a clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
+LINK_COMPONENTS := bitreader mc core
+USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
+	   clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt
index 775d590dd6..f0a34a5798 100644
--- a/tools/c-index-test/CMakeLists.txt
+++ b/tools/c-index-test/CMakeLists.txt
@@ -16,6 +16,7 @@ set( LLVM_USED_LIBS
 set( LLVM_LINK_COMPONENTS
   bitreader
   mc
+  core
   )
 
 add_clang_executable(c-index-test
diff --git a/tools/c-index-test/Makefile b/tools/c-index-test/Makefile
index 82103a51fa..06e24053aa 100644
--- a/tools/c-index-test/Makefile
+++ b/tools/c-index-test/Makefile
@@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1
 
 include $(LEVEL)/Makefile.config
 
-LINK_COMPONENTS := bitreader mc
+LINK_COMPONENTS := bitreader mc core
 USEDLIBS = CIndex.a clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
 	   clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
diff --git a/tools/index-test/CMakeLists.txt b/tools/index-test/CMakeLists.txt
index 5ae0d494f3..9472e580fb 100644
--- a/tools/index-test/CMakeLists.txt
+++ b/tools/index-test/CMakeLists.txt
@@ -3,6 +3,7 @@ set(LLVM_NO_RTTI 1)
 set( LLVM_USED_LIBS
   clangIndex
   clangFrontend
+  clangDriver
   clangSema
   clangAnalysis
   clangAST
@@ -14,6 +15,7 @@ set( LLVM_USED_LIBS
 set( LLVM_LINK_COMPONENTS
   bitreader
   mc
+  core
   )
 
 add_clang_executable(index-test
diff --git a/tools/index-test/Makefile b/tools/index-test/Makefile
index 95c3dd073a..4ee98fc7cc 100644
--- a/tools/index-test/Makefile
+++ b/tools/index-test/Makefile
@@ -18,8 +18,8 @@ TOOL_NO_EXPORTS = 1
 
 include $(LEVEL)/Makefile.config
 
-LINK_COMPONENTS := bitreader mc
-USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a clangAnalysis.a \
-	   clangAST.a clangParse.a clangLex.a clangBasic.a
+LINK_COMPONENTS := bitreader mc core
+USEDLIBS = clangIndex.a clangFrontend.a clangDriver.a clangSema.a \
+	   clangAnalysis.a clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(LLVM_SRC_ROOT)/Makefile.rules