shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

meson: skip to search clang, llvm-string, and bpftool, if libbpf not found

Browse Source 
Prompted by https://github.com/systemd/systemd/pull/22093#issuecomment-1016254914.
This commit is contained in:
Yu Watanabe 2022-01-19 18:46:09 +09:00 committed by Evgeny Vereshchagin
parent 39f83dd760
commit 30b6f7d714
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -984,7 +984,7 @@ bpf_framework_required = want_bpf_framework == 'true'
libbpf = dependency('libbpf', required : bpf_framework_required, version : '>= 0.2')
conf.set10('HAVE_LIBBPF', libbpf.found())
if want_bpf_framework == 'false'
if want_bpf_framework == 'false' or not libbpf.found()
conf.set10('BPF_FRAMEWORK', 0)
else
# Support 'versioned' clang/llvm-strip binaries, as seen on Debian/Ubuntu
@ -1030,7 +1030,7 @@ else
required : bpf_framework_required,
version : '>= 5.6')
deps_found = libbpf.found() and clang_found and clang_supports_bpf and clang_supports_flags and llvm_strip.found() and bpftool.found()
deps_found = clang_found and clang_supports_bpf and clang_supports_flags and llvm_strip.found() and bpftool.found()
# Can build BPF program from source code in restricted C
conf.set10('BPF_FRAMEWORK', deps_found)