diff options
| -rwxr-xr-x | cmake/modules/LLVMConfig.cmake | 15 | ||||
| -rw-r--r-- | tools/llvm-config/llvm-config.in.in | 7 |
2 files changed, 21 insertions, 1 deletions
diff --git a/cmake/modules/LLVMConfig.cmake b/cmake/modules/LLVMConfig.cmake index 5fa08a3..9bcb02d 100755 --- a/cmake/modules/LLVMConfig.cmake +++ b/cmake/modules/LLVMConfig.cmake @@ -65,6 +65,7 @@ function(explicit_map_components_to_libraries out_libs) foreach(c ${link_components}) # add codegen/asmprinter list(FIND LLVM_TARGETS_TO_BUILD ${c} idx) + list(APPEND expanded_components "LLVM${c}Info") if( NOT idx LESS 0 ) list(FIND llvm_libs "LLVM${c}CodeGen" idx) 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_LLVMipa LLVMAnalysis LLVMCore LLVMSupport) 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) diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 10a13b6..303bffb 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/tools/llvm-config/llvm-config.in.in @@ -333,7 +333,12 @@ sub build_name_map { foreach my $target (@TARGETS_BUILT) { # FIXME: Temporary, until we don't switch all targets 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]] } } |