Andrii Nakryiko <andrii.nakryiko@xxxxxxxxx> writes: > On Thu, Jan 16, 2020 at 5:23 AM Toke Høiland-Jørgensen <toke@xxxxxxxxxx> wrote: >> >> From: Toke Høiland-Jørgensen <toke@xxxxxxxxxx> >> >> Fix the runqslower tool to include libbpf header files with the bpf/ >> prefix, to be consistent with external users of the library. Also ensure >> that all includes of exported libbpf header files (those that are exported >> on 'make install' of the library) use bracketed includes instead of quoted. >> >> To not break the build, keep the old include path until everything has been >> changed to the new one; a subsequent patch will remove that. >> >> Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") >> Signed-off-by: Toke Høiland-Jørgensen <toke@xxxxxxxxxx> >> --- >> tools/bpf/runqslower/Makefile | 5 +++-- >> tools/bpf/runqslower/runqslower.bpf.c | 2 +- >> tools/bpf/runqslower/runqslower.c | 4 ++-- >> 3 files changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/tools/bpf/runqslower/Makefile b/tools/bpf/runqslower/Makefile >> index 89fb7cd30f1a..c0512b830805 100644 >> --- a/tools/bpf/runqslower/Makefile >> +++ b/tools/bpf/runqslower/Makefile >> @@ -5,6 +5,7 @@ LLC := llc >> LLVM_STRIP := llvm-strip >> DEFAULT_BPFTOOL := $(OUTPUT)/sbin/bpftool >> BPFTOOL ?= $(DEFAULT_BPFTOOL) >> +LIBBPF_INCLUDE := -I$(abspath ../../lib) -I$(abspath ../../lib/bpf) > > I'd probably put all the -I's into single INCLUDES var and include > that one instead of mixing -I$(OUTPUT) and $(LIBBPF_INCLUDE), but this > works too. Hmm, yeah, not a bad idea, actually. Since it seems I'm respinning anyway, I'll fix that up as well. -Toke