Commit b44d7056 authored by 4ast's avatar 4ast Committed by GitHub

Merge pull request #1503 from iovisor/yhs_dev

fix build issue for llvm 5.0.1
parents 4e04c945 bd7fa55b
...@@ -8,7 +8,7 @@ list(FIND LLVM_AVAILABLE_LIBS "LLVMCoroutines" _llvm_coroutines) ...@@ -8,7 +8,7 @@ list(FIND LLVM_AVAILABLE_LIBS "LLVMCoroutines" _llvm_coroutines)
if (${_llvm_coroutines} GREATER -1) if (${_llvm_coroutines} GREATER -1)
list(APPEND llvm_raw_libs coroutines) list(APPEND llvm_raw_libs coroutines)
endif() endif()
if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "5") if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6)
list(APPEND llvm_raw_libs bpfasmparser) list(APPEND llvm_raw_libs bpfasmparser)
list(APPEND llvm_raw_libs bpfdisassembler) list(APPEND llvm_raw_libs bpfdisassembler)
endif() endif()
......
...@@ -29,7 +29,7 @@ set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0 ...@@ -29,7 +29,7 @@ set_target_properties(bpf-shared PROPERTIES VERSION ${REVISION_LAST} SOVERSION 0
set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bpf) set_target_properties(bpf-shared PROPERTIES OUTPUT_NAME bpf)
set(bcc_common_sources bpf_common.cc bpf_module.cc exported_files.cc) set(bcc_common_sources bpf_common.cc bpf_module.cc exported_files.cc)
if (${LLVM_PACKAGE_VERSION} VERSION_GREATER "5") if (${LLVM_PACKAGE_VERSION} VERSION_EQUAL 6 OR ${LLVM_PACKAGE_VERSION} VERSION_GREATER 6)
set(bcc_common_sources ${bcc_common_sources} bcc_debug.cc) set(bcc_common_sources ${bcc_common_sources} bcc_debug.cc)
endif() endif()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment