From 68e101da7acd2a595487a1df5c37a23e41383161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 27 Jul 2021 16:20:40 +0200 Subject: [PATCH] meson: adjust comment about find_program() usage The FIXME was not correct: with 'dirs' we'd put the fixed path first (see the docs for find_program()). --- meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 84f288c664..5ba92bdf6f 100644 --- a/meson.build +++ b/meson.build @@ -948,9 +948,11 @@ if want_bpf_framework == 'false' else clang = find_program('clang', 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) + bpf_arches = ['x86_64'] deps_found = libbpf.found() and clang.found() and llvm_strip.found() and bpftool.found() # Can build BPF program from source code in restricted C