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

diff --git a/tools/CIndex/CMakeLists.txt b/tools/CIndex/CMakeLists.txt
index 69de8a1acffbd05c663ec6c91f0c5bdfb4960e89..a3ff3db2d9b5a0a851fc8fa5a1d7952dabac5bd5 100644 (file)
--- 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 17e1f3d034a00f2c17cbde6733fdf4602cba7e07..94f04670000d1fdbdb2f334d52b171167d1066dd 100644 (file)
--- 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 775d590dd601af6396de8bd05c596aad2bf1c80e..f0a34a57987e624dcb6f10a4f9234373bdd54d9b 100644 (file)
--- 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 82103a51fac923ec2ef9fb827a45c76562ee66fd..06e24053aa0aaeb3d1d11c9f72899d01fc605b61 100644 (file)
--- 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 5ae0d494f3c20eca94b8a805f37ef8a029db693c..9472e580fbc5ded43486a3cd632022442a25bc50 100644 (file)
--- 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 95c3dd073a8945e847c24a5a292159fff2be146f..4ee98fc7cc99eb3c411ed9ce25d797bba7fdffb0 100644 (file)
--- 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