[cfe-commits] r90350 - in /cfe/trunk/tools: CIndex/CMakeLists.txt CIndex/Makefile c-index-test/CMakeLists.txt c-index-test/Makefile index-test/CMakeLists.txt index-test/Makefile

[Daniel Dunbar]

Great, sorry about the breakage. We really need to move to explicit
dependencies... :/

 - Daniel

On Wed, Dec 2, 2009 at 6:56 PM, Zhongxing Xu <xuzhongxing at gmail.com> wrote:
> Thanks. c-test-index now builds.
>
> 2009/12/3 Daniel Dunbar <daniel at zuster.org>:
>> Author: ddunbar
>> Date: Wed Dec  2 15:47:55 2009
>> New Revision: 90350
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=90350&view=rev
>> Log:
>> 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? :)
>>
>> Modified:
>>    cfe/trunk/tools/CIndex/CMakeLists.txt
>>    cfe/trunk/tools/CIndex/Makefile
>>    cfe/trunk/tools/c-index-test/CMakeLists.txt
>>    cfe/trunk/tools/c-index-test/Makefile
>>    cfe/trunk/tools/index-test/CMakeLists.txt
>>    cfe/trunk/tools/index-test/Makefile
>>
>> Modified: cfe/trunk/tools/CIndex/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CMakeLists.txt?rev=90350&r1=90349&r2=90350&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/tools/CIndex/CMakeLists.txt (original)
>> +++ cfe/trunk/tools/CIndex/CMakeLists.txt Wed Dec  2 15:47:55 2009
>> @@ -3,11 +3,20 @@
>>  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)
>>
>> Modified: cfe/trunk/tools/CIndex/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/Makefile?rev=90350&r1=90349&r2=90350&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/tools/CIndex/Makefile (original)
>> +++ cfe/trunk/tools/CIndex/Makefile Wed Dec  2 15:47:55 2009
>> @@ -21,8 +21,9 @@
>>  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
>>
>>
>> Modified: cfe/trunk/tools/c-index-test/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/CMakeLists.txt?rev=90350&r1=90349&r2=90350&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/tools/c-index-test/CMakeLists.txt (original)
>> +++ cfe/trunk/tools/c-index-test/CMakeLists.txt Wed Dec  2 15:47:55 2009
>> @@ -16,6 +16,7 @@
>>  set( LLVM_LINK_COMPONENTS
>>   bitreader
>>   mc
>> +  core
>>   )
>>
>>  add_clang_executable(c-index-test
>>
>> Modified: cfe/trunk/tools/c-index-test/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/Makefile?rev=90350&r1=90349&r2=90350&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/tools/c-index-test/Makefile (original)
>> +++ cfe/trunk/tools/c-index-test/Makefile Wed Dec  2 15:47:55 2009
>> @@ -18,7 +18,7 @@
>>
>>  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
>>
>>
>> Modified: cfe/trunk/tools/index-test/CMakeLists.txt
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/index-test/CMakeLists.txt?rev=90350&r1=90349&r2=90350&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/tools/index-test/CMakeLists.txt (original)
>> +++ cfe/trunk/tools/index-test/CMakeLists.txt Wed Dec  2 15:47:55 2009
>> @@ -3,6 +3,7 @@
>>  set( LLVM_USED_LIBS
>>   clangIndex
>>   clangFrontend
>> +  clangDriver
>>   clangSema
>>   clangAnalysis
>>   clangAST
>> @@ -14,6 +15,7 @@
>>  set( LLVM_LINK_COMPONENTS
>>   bitreader
>>   mc
>> +  core
>>   )
>>
>>  add_clang_executable(index-test
>>
>> Modified: cfe/trunk/tools/index-test/Makefile
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/index-test/Makefile?rev=90350&r1=90349&r2=90350&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/tools/index-test/Makefile (original)
>> +++ cfe/trunk/tools/index-test/Makefile Wed Dec  2 15:47:55 2009
>> @@ -18,8 +18,8 @@
>>
>>  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
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>