From 0025fe59205eeb5a23cdc73d9bcbf4e917a07769 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C4=B0smail=20D=C3=B6nmez?= Date: Mon, 21 Mar 2016 08:44:48 +0200 Subject: [PATCH] Fix llvm shared build Trim the llvm libs to the direct requirements only and use llvm_expand_dependencies to discover all dependencies. --- src/cc/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt index 8781b9b..73a5b85 100644 --- a/src/cc/CMakeLists.txt +++ b/src/cc/CMakeLists.txt @@ -42,16 +42,18 @@ set_target_properties(bcc-static PROPERTIES OUTPUT_NAME bcc) # BPF is still experimental otherwise it should be available #llvm_map_components_to_libnames(llvm_libs bpf mcjit irreader passes) -llvm_map_components_to_libnames(llvm_libs mcjit irreader passes linker - instrumentation objcarcopts bitwriter option x86codegen) +llvm_map_components_to_libnames(llvm_libs bitwriter bpfcodegen irreader linker + mcjit objcarcopts option passes x86codegen) +llvm_expand_dependencies(expanded_libs ${llvm_libs}) + # order is important set(clang_libs ${libclangFrontend} ${libclangSerialization} ${libclangDriver} ${libclangParse} ${libclangSema} ${libclangCodeGen} ${libclangAnalysis} ${libclangRewrite} ${libclangEdit} ${libclangAST} ${libclangLex} ${libclangBasic}) # Link against LLVM libraries -target_link_libraries(bcc-shared b_frontend clang_frontend ${clang_libs} ${llvm_libs} LLVMBPFCodeGen) -target_link_libraries(bcc-static b_frontend clang_frontend bcc-loader-static ${clang_libs} ${llvm_libs} LLVMBPFCodeGen) +target_link_libraries(bcc-shared b_frontend clang_frontend ${clang_libs} ${expanded_libs}) +target_link_libraries(bcc-static b_frontend clang_frontend bcc-loader-static ${clang_libs} ${expanded_libs}) install(TARGETS bcc-shared LIBRARY COMPONENT libbcc DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- 2.7.4