shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-25 06:03:40 +03:00
Code

meson: adjust comment about find_program() usage

Browse Source 
The FIXME was not correct: with 'dirs' we'd put the fixed path first
(see the docs for find_program()).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-07-27 16:20:40 +02:00
parent 81875efe20
commit 68e101da7a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -948,9 +948,11 @@ if want_bpf_framework == 'false'
else else
clang = find_program('clang', required : bpf_framework_required) clang = find_program('clang', required : bpf_framework_required)
llvm_strip = find_program('llvm-strip', required : bpf_framework_required) llvm_strip = find_program('llvm-strip', required : bpf_framework_required)
# Debian installs this in /usr/sbin/ which is not in $PATH
# FIXME: use the 'dirs' parameter once we bump Meson version to >= 0.53 # Debian installs this in /usr/sbin/ which is not in $PATH.
# We check for 'bpftool' first, honouring $PATH, and in /usr/sbin/ for Debian.
bpftool = find_program('bpftool', '/usr/sbin/bpftool', required : bpf_framework_required) bpftool = find_program('bpftool', '/usr/sbin/bpftool', required : bpf_framework_required)
bpf_arches = ['x86_64'] bpf_arches = ['x86_64']
deps_found = libbpf.found() and clang.found() and llvm_strip.found() and bpftool.found() deps_found = libbpf.found() and clang.found() and llvm_strip.found() and bpftool.found()
# Can build BPF program from source code in restricted C # Can build BPF program from source code in restricted C