Teach Makefiles & CMake to link in the <TARGET>Info library when linking the

TARGET component.
 - Also, updated some CMake library dependencies, it is still missing some
   though. :(


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75755 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-07-15 07:43:34 +00:00
parent f23d4930bd
commit 8cca8f98bb
2 changed files with 21 additions and 1 deletions

View File

@ -65,6 +65,7 @@ function(explicit_map_components_to_libraries out_libs)
foreach(c ${link_components}) foreach(c ${link_components})
# add codegen/asmprinter # add codegen/asmprinter
list(FIND LLVM_TARGETS_TO_BUILD ${c} idx) list(FIND LLVM_TARGETS_TO_BUILD ${c} idx)
list(APPEND expanded_components "LLVM${c}Info")
if( NOT idx LESS 0 ) if( NOT idx LESS 0 )
list(FIND llvm_libs "LLVM${c}CodeGen" idx) list(FIND llvm_libs "LLVM${c}CodeGen" idx)
if( NOT idx LESS 0 ) if( NOT idx LESS 0 )
@ -192,3 +193,17 @@ set(MSVC_LIB_DEPS_LLVMTarget LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMipa) set(MSVC_LIB_DEPS_LLVMTransformUtils LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMipa)
set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport) set(MSVC_LIB_DEPS_LLVMipa LLVMAnalysis LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMipo LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMTransformUtils LLVMipa) set(MSVC_LIB_DEPS_LLVMipo LLVMAnalysis LLVMCore LLVMSupport LLVMTarget LLVMTransformUtils LLVMipa)
set(MSVC_LIB_DEPS_LLVMARMInfo LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMAlphaInfo LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMCBackendInfo LLVMSupport)
set(MSVC_LIB_DEPS_LLVMCellSPUInfo LLVMSupport)
set(MSVC_LIB_DEPS_LLVMCppBackendInfo LLVMSupport)
set(MSVC_LIB_DEPS_LLVMIA64Info LLVMSupport)
set(MSVC_LIB_DEPS_LLVMMSILInfo LLVMSupport)
set(MSVC_LIB_DEPS_LLVMMSP430Info LLVMSupport)
set(MSVC_LIB_DEPS_LLVMMipsInfo LLVMSupport)
set(MSVC_LIB_DEPS_LLVMPIC16Info LLVMSupport)
set(MSVC_LIB_DEPS_LLVMPowerPCInfo LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMSparcInfo LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMX86Info LLVMCore LLVMSupport)
set(MSVC_LIB_DEPS_LLVMXCoreInfo LLVMSupport)

View File

@ -333,7 +333,12 @@ sub build_name_map {
foreach my $target (@TARGETS_BUILT) { foreach my $target (@TARGETS_BUILT) {
# FIXME: Temporary, until we don't switch all targets # FIXME: Temporary, until we don't switch all targets
if (defined $NAME_MAP{$target.'asmprinter'}) { if (defined $NAME_MAP{$target.'asmprinter'}) {
$NAME_MAP{$target} = [$target.'asmprinter', $target.'codegen'] $NAME_MAP{$target} = [$target.'info',
$target.'asmprinter',
$target.'codegen']
} else {
$NAME_MAP{$target} = [$target.'info',
$NAME_MAP{$target}[0]]
} }
} }