diff options
Diffstat (limited to 'tools/llvm-config')
| -rw-r--r-- | tools/llvm-config/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | tools/llvm-config/llvm-config.in.in | 8 |
2 files changed, 6 insertions, 26 deletions
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt index bc23a64..6016862 100644 --- a/tools/llvm-config/CMakeLists.txt +++ b/tools/llvm-config/CMakeLists.txt @@ -138,27 +138,3 @@ install(FILES ${LLVM_CONFIG} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin) - - -# Regeneration of library dependencies. - -# See the comments at the end of cmake/modules/LLVM-Config.cmake for -# notes and guidelines. - -set(LLVMLibDeps ${LLVM_MAIN_SRC_DIR}/cmake/modules/LLVMLibDeps.cmake) -set(LLVMLibDeps_TMP ${CMAKE_CURRENT_BINARY_DIR}/LLVMLibDeps.cmake.tmp) - -add_custom_command(OUTPUT ${LLVMLibDeps_TMP} - COMMAND sed -e s'@\\.a@@g' -e s'@\\.so@@g' -e 's@libLLVM@LLVM@g' -e 's@: @ @' -e 's@\\\(.*\\\)@set\(MSVC_LIB_DEPS_\\1\)@' ${FINAL_LIBDEPS} > ${LLVMLibDeps_TMP} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${LLVMLibDeps_TMP} ${LLVMLibDeps} - DEPENDS ${FINAL_LIBDEPS} - COMMENT "Updating cmake library dependencies file ${LLVMLibDeps}" - ) - -if( LLVM_TARGETS_TO_BUILD STREQUAL LLVM_ALL_TARGETS ) - add_custom_target(llvmlibdeps.target ALL DEPENDS ${LLVMLibDeps_TMP}) - add_dependencies(llvmlibdeps.target llvm-config.target) - set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} llvmlibdeps.target) -endif() - -set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE) diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 840a10e..03efb03 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/tools/llvm-config/llvm-config.in.in @@ -314,6 +314,7 @@ sub build_name_map { } # Add target-specific entries + my @all_targets; foreach my $target (@TARGETS_BUILT) { # FIXME: Temporary, until we don't switch all targets if (defined $NAME_MAP{$target.'asmprinter'}) { @@ -321,8 +322,8 @@ sub build_name_map { $target.'asmprinter', $target.'codegen'] } elsif (defined $NAME_MAP{$target.'codegen'}) { - $NAME_MAP{$target} = [$target.'info', - $target.'codegen'] + $NAME_MAP{$target} = [$target.'info', + $target.'codegen'] } else { $NAME_MAP{$target} = [$target.'info', $NAME_MAP{$target}[0]] @@ -335,6 +336,8 @@ sub build_name_map { if (defined $NAME_MAP{$target.'disassembler'}) { push @{$NAME_MAP{$target}},$target.'disassembler' } + + push @all_targets, $target; } # Add virtual entries. @@ -342,6 +345,7 @@ sub build_name_map { $NAME_MAP{'nativecodegen'} = have_native_backend() ? [$ARCH.'codegen'] : []; $NAME_MAP{'backend'} = have_native_backend() ? ['native'] : ['cbackend']; $NAME_MAP{'engine'} = find_best_engine; + $NAME_MAP{'all-targets'} = \@all_targets; $NAME_MAP{'all'} = [name_map_entries]; # Must be last. } |