tools, bpftool: Correctly evaluate $(BUILD_BPF_SKELS) in Makefile
authorTobias Klauser <tklauser@distanz.ch>
Tue, 23 Jun 2020 10:37:10 +0000 (12:37 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 23 Jun 2020 22:06:46 +0000 (00:06 +0200)
commit9d9d8cc21e3827b89e414f990016836290de3038
treef97fe16335c999b6fe9d0db8d9995c9a65be3b1c
parent2fde1747c986cac28fa66d0cffd7577db042640b
tools, bpftool: Correctly evaluate $(BUILD_BPF_SKELS) in Makefile

Currently, if the clang-bpf-co-re feature is not available, the build
fails with e.g.

  CC       prog.o
prog.c:1462:10: fatal error: profiler.skel.h: No such file or directory
 1462 | #include "profiler.skel.h"
      |          ^~~~~~~~~~~~~~~~~

This is due to the fact that the BPFTOOL_WITHOUT_SKELETONS macro is not
defined, despite BUILD_BPF_SKELS not being set. Fix this by correctly
evaluating $(BUILD_BPF_SKELS) when deciding on whether to add
-DBPFTOOL_WITHOUT_SKELETONS to CFLAGS.

Fixes: 05aca6da3b5a ("tools/bpftool: Generalize BPF skeleton support and generate vmlinux.h")
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Quentin Monnet <quentin@isovalent.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/20200623103710.10370-1-tklauser@distanz.ch
tools/bpf/bpftool/Makefile