diff --git a/meson-scripts/compile_scx_lib b/meson-scripts/compile_scx_lib index ef9d22fdb..8692fab0d 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 diff --git a/meson.build b/meson.build index 21b808b3b..c22f6a4a7 100644 --- a/meson.build +++ b/meson.build @@ -270,12 +270,15 @@ bpf_includes = ['-I', join_paths(meson.current_source_dir(), 'scheds/include'), '-I', join_paths(meson.current_source_dir(), 'scheds/include/bpf-compat'), '-I', join_paths(meson.current_source_dir(), 'lib/include'),] +lib_objs = [] +subdir('lib') + # # Generators to build BPF skel file for C schedulers. # gen_bpf_o = generator(bpf_clang, output: '@BASENAME@.o', - depends: [libbpf], + depends: [libbpf, scx_lib], arguments: [bpf_base_cflags, '-target', 'bpf', libbpf_c_headers, bpf_includes, '-c', '@INPUT@', '-o', '@OUTPUT@']) @@ -459,9 +462,6 @@ if enable_stress endif endif -lib_objs = [] -subdir('lib') - thread_dep = dependency('threads') subdir('scheds')