From 21cf3ccd1d263cf7aac3afe337911f18ba329dca Mon Sep 17 00:00:00 2001 From: Andrea Righi Date: Sun, 8 Dec 2024 08:45:47 +0100 Subject: [PATCH] scx_lib: use the proper bpftool Make sure to use the right bpftool when building scx_lib, instead of always relying on the system's bpftool. Fixes: 3d72a8e ("add library infrastructure and turn allocator into a library") Signed-off-by: Andrea Righi --- lib/meson.build | 2 +- meson-scripts/compile_scx_lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index 359ac2598..dba4d085a 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -9,7 +9,7 @@ foreach src: libs input: src + '.bpf.c', command: [bpf_clang, bpf_base_cflags, '-target', 'bpf', libbpf_c_headers, bpf_includes, '-c', '@INPUT@', '-o', '@OUTPUT@'], - depends: [libbpf] + depends: [libbpf, bpftool_target] ) objs += [bpf_o] diff --git a/meson-scripts/compile_scx_lib b/meson-scripts/compile_scx_lib index 8692fab0d..62408e67f 100755 --- a/meson-scripts/compile_scx_lib +++ b/meson-scripts/compile_scx_lib @@ -9,4 +9,4 @@ dir="$PWD/lib" libs=`find $dir -type f -name *.bpf.o | grep -v $lib.bpf.o` -"$bpftool" gen object "$output" $libs +${bpftool} gen object "$output" $libs