Commit ec247044 authored by Jerome Marchand's avatar Jerome Marchand Committed by Andrii Nakryiko
Browse files

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: 384b6b3b ("samples: bpf: Add vmlinux.h generation support")
Reported-by: default avatarCKI Project <cki-project@redhat.com>
Reported-by: default avatarVeronika Kabatova <vkabatov@redhat.com>
Signed-off-by: default avatarJerome Marchand <jmarchan@redhat.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220507161635.2219052-1-jmarchan@redhat.com
parent bfa92e0b

samples/bpf/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -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