On Wed, Dec 20, 2017 at 12:26:30PM -0800, Yonghong Song wrote: > > > On 12/20/17 12:19 PM, Roman Gushchin wrote: > > Bpftool determines it's own version based on the kernel > > version, which is picked from the linux/version.h header. > > > > It's strange to use the version of the installed kernel > > headers, and makes much more sense to use the version > > of the actual source tree, where bpftool sources are. > > > > This patch adds $(srctree)/usr/include to the list > > of include files, which causes bpftool to use the version > > from the source tree. > > > > Example: > > before: > > > > $ bpftool version > > bpftool v4.14.6 > > > > after: > > $ bpftool version > > bpftool v4.15.0 > > > > Signed-off-by: Roman Gushchin <g...@fb.com> > > Cc: Jakub Kicinski <jakub.kicin...@netronome.com> > > Cc: Alexei Starovoitov <a...@kernel.org> > > Cc: Daniel Borkmann <dan...@iogearbox.net> > > --- > > tools/bpf/bpftool/Makefile | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile > > index 9c089cfa5f3f..6864d416c49e 100644 > > --- a/tools/bpf/bpftool/Makefile > > +++ b/tools/bpf/bpftool/Makefile > > @@ -37,7 +37,9 @@ CC = gcc > > CFLAGS += -O2 > > CFLAGS += -W -Wall -Wextra -Wno-unused-parameter -Wshadow > > -CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/tools/include/uapi > > -I$(srctree)/tools/include -I$(srctree)/tools/lib/bpf > > -I$(srctree)/kernel/bpf/ > > +CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/tools/include/uapi > > +CFLAGS += -I$(srctree)/tools/include -I$(srctree)/tools/lib/bpf > > +CFLAGS += -I$(srctree)/kernel/bpf/ -I$(srctree)/usr/include > > -I$(srctree)/usr/include may not work if build directory is not the same as > the source directory. You probably should use > -I$(objtree)/usr/include?
$(objtree) is not defined there, so it doesn't work. Tbh, I struggle to say if it's supposed to work there or not. Thanks!
