From: Quentin Monnet <quentin@isovalent.com>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
Quentin Monnet <quentin@isovalent.com>
Subject: [PATCH bpf-next 3/6] bpftool: Use $(OUTPUT) and not $(O) for VMLINUX_BTF_PATHS in Makefile
Date: Wed, 10 Nov 2021 11:46:29 +0000 [thread overview]
Message-ID: <20211110114632.24537-4-quentin@isovalent.com> (raw)
In-Reply-To: <20211110114632.24537-1-quentin@isovalent.com>
The Makefile for bpftool relies on $(OUTPUT), and not on $(O), for
passing the output directory. So $(VMLINUX_BTF_PATHS), used for
searching for kernel BTF info, should use the same variable.
Fixes: 05aca6da3b5a ("tools/bpftool: Generalize BPF skeleton support and generate vmlinux.h")
Signed-off-by: Quentin Monnet <quentin@isovalent.com>
---
tools/bpf/bpftool/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index 2a846cb92120..40abf50b59d4 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile
@@ -150,7 +150,7 @@ $(BOOTSTRAP_OBJS): $(LIBBPF_BOOTSTRAP)
OBJS = $(patsubst %.c,$(OUTPUT)%.o,$(SRCS)) $(OUTPUT)disasm.o
$(OBJS): $(LIBBPF) $(LIBBPF_INTERNAL_HDRS)
-VMLINUX_BTF_PATHS ?= $(if $(O),$(O)/vmlinux) \
+VMLINUX_BTF_PATHS ?= $(if $(OUTPUT),$(OUTPUT)/vmlinux) \
$(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux) \
../../../vmlinux \
/sys/kernel/btf/vmlinux \
--
2.32.0
next prev parent reply other threads:[~2021-11-10 11:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 11:46 [PATCH bpf-next 0/6] bpftool: miscellaneous fixes Quentin Monnet
2021-11-10 11:46 ` [PATCH bpf-next 1/6] bpftool: Fix memory leak in prog_dump() Quentin Monnet
2021-11-10 11:46 ` [PATCH bpf-next 2/6] bpftool: Remove inclusion of utilities.mak from Makefiles Quentin Monnet
2021-11-10 11:46 ` Quentin Monnet [this message]
2021-11-11 18:59 ` [PATCH bpf-next 3/6] bpftool: Use $(OUTPUT) and not $(O) for VMLINUX_BTF_PATHS in Makefile Andrii Nakryiko
2021-11-11 23:39 ` Quentin Monnet
2021-11-12 1:52 ` Andrii Nakryiko
2021-11-10 11:46 ` [PATCH bpf-next 4/6] bpftool: Fix indent in option lists in the documentation Quentin Monnet
2021-11-10 11:46 ` [PATCH bpf-next 5/6] bpftool: Update the lists of names for maps and prog-attach types Quentin Monnet
2021-11-10 11:46 ` [PATCH bpf-next 6/6] bpftool: Fix mixed indentation in documentation Quentin Monnet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211110114632.24537-4-quentin@isovalent.com \
--to=quentin@isovalent.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.