summaryrefslogtreecommitdiffstats
path: root/samples
diff options
context:
space:
mode:
authorJerome Marchand <jmarchan@redhat.com>2022-05-07 18:16:35 +0200
committerAndrii Nakryiko <andrii@kernel.org>2022-05-09 17:40:43 -0700
commitec24704492d8791a52a75a39e3ad762b6e017bc6 (patch)
tree03eeef08d25a805578c1ffbd7f61bb675f6b7354 /samples
parentbfa92e0bdc8ee5d444086fa25489de861a17b085 (diff)
downloadlinux-ec24704492d8791a52a75a39e3ad762b6e017bc6.tar.bz2
samples: bpf: Don't fail for a missing VMLINUX_BTF when VMLINUX_H is provided
samples/bpf build currently always fails if it can't generate vmlinux.h from vmlinux, even when vmlinux.h is directly provided by VMLINUX_H variable, which makes VMLINUX_H pointless. Only fails when neither method works. Fixes: 384b6b3bbf0d ("samples: bpf: Add vmlinux.h generation support") Reported-by: CKI Project <cki-project@redhat.com> Reported-by: Veronika Kabatova <vkabatov@redhat.com> Signed-off-by: Jerome Marchand <jmarchan@redhat.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20220507161635.2219052-1-jmarchan@redhat.com
Diffstat (limited to 'samples')
-rw-r--r--samples/bpf/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile
index 8fff5ad3444b..03e3d3529ac9 100644
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@ -369,16 +369,15 @@ VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))
$(obj)/vmlinux.h: $(VMLINUX_BTF) $(BPFTOOL)
ifeq ($(VMLINUX_H),)
+ifeq ($(VMLINUX_BTF),)
+ $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)",\
+ build the kernel or set VMLINUX_BTF or VMLINUX_H variable)
+endif
$(Q)$(BPFTOOL) btf dump file $(VMLINUX_BTF) format c > $@
else
$(Q)cp "$(VMLINUX_H)" $@
endif
-ifeq ($(VMLINUX_BTF),)
- $(error Cannot find a vmlinux for VMLINUX_BTF at any of "$(VMLINUX_BTF_PATHS)",\
- build the kernel or set VMLINUX_BTF variable)
-endif
-
clean-files += vmlinux.h
# Get Clang's default includes on this system, as opposed to those seen by