Merge pull request #1071 from sched-ext/scx-lib-bpftool-fix

scx_lib: use the proper bpftool
sched-ext · Dec 8, 2024 · b4db5ee · b4db5ee
2 parents 5e1fea8 + 21cf3cc
commit b4db5ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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