summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2020-09-23 20:57:34 +0200
committerAlexei Starovoitov <ast@kernel.org>2020-09-23 12:43:04 -0700
commit017dab341ee75c0d3675b9b3d28be28d38e6defc (patch)
tree6991516cdeb187ee2545a36a20a39e5c486d8142 /Makefile
parent0789e13bc3f84f0adafe1935af036956638950f9 (diff)
downloadlinux-next-017dab341ee75c0d3675b9b3d28be28d38e6defc.tar.gz
bpf: Check CONFIG_BPF option for resolve_btfids
Currently all the resolve_btfids 'users' are under CONFIG_BPF code, so if we have CONFIG_BPF disabled, resolve_btfids will fail, because there's no data to resolve. Disabling resolve_btfids if there's CONFIG_BPF disabled, so we won't fail such builds. Suggested-by: Andrii Nakryiko <andriin@fb.com> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Andrii Nakryiko <andriin@fb.com> Link: https://lore.kernel.org/bpf/20200923185735.3048198-1-jolsa@kernel.org
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c4470a4e131f..b05682eea2c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1084,13 +1084,15 @@ ifdef CONFIG_STACK_VALIDATION
endif
endif
+ifdef CONFIG_BPF
ifdef CONFIG_DEBUG_INFO_BTF
ifeq ($(has_libelf),1)
resolve_btfids_target := tools/bpf/resolve_btfids FORCE
else
ERROR_RESOLVE_BTFIDS := 1
endif
-endif
+endif # CONFIG_DEBUG_INFO_BTF
+endif # CONFIG_BPF
PHONY += prepare0