On Mon, Jan 20, 2020 at 4:57 AM Toke Høiland-Jørgensen toke@redhat.com wrote:
Andrii Nakryiko andrii.nakryiko@gmail.com writes:
On Fri, Jan 17, 2020 at 5:37 AM Toke Høiland-Jørgensen toke@redhat.com wrote:
From: Toke Høiland-Jørgensen toke@redhat.com
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") Acked-by: Andrii Nakryiko andriin@fb.com Signed-off-by: Toke Høiland-Jørgensen toke@redhat.com
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 b62fc9646c39..9f022f7f2593 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) +INCLUDES := -I$(OUTPUT) -I$(abspath ../../lib) -I$(abspath ../../lib/bpf) LIBBPF_SRC := $(abspath ../../lib/bpf)
drop LIBBPF_SRC, it's not used anymore
It is: in the rule for building libbpf there's a '-C $(LIBBPF_SRC)'
Ah, right, missed that one. Looked a bit weird to have $(abspath ../../lib/bpf) used in INCLUDES and then separate LIBBPF_SRC definition there, maybe
LIBBPF_SRC := $(abspath ../../lib/bpf) INCLUDES := -I$(OUTPUT) -I$(abspath ../../lib) -I$(LIBBPF_SRC)
-Toke