[PATCH bpf-next 3/4] tools/resolve_btfids: Set srctree variable unconditionally
From: Jiri Olsa <jolsa@kernel.org>
Date: 2021-02-04 21:19:44
Also in:
bpf, linux-kbuild
Subsystem:
bpf [general] (safe dynamic programs and tools), the rest · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2021-02-06 · Re: [PATCH bpf-next 3/4] tools/resolve_btfids: Set srctree variable unconditionally · Andrii Nakryiko <hidden>
- 2021-02-05 · [PATCH bpf-next 3/4] tools/resolve_btfids: Set srctree variable unconditionally · Jiri Olsa <jolsa@kernel.org>
We want this clean to be called from tree's root Makefile, which defines same srctree variable and that will screw the make setup. We actually do not use srctree being passed from outside, so we can solve this by setting current srctree value directly. Also root Makefile does not define the implicit RM variable, so adding RM initialization. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/bpf/resolve_btfids/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile
index 3007cfabf5e6..b41fc9a81e83 100644
--- a/tools/bpf/resolve_btfids/Makefile
+++ b/tools/bpf/resolve_btfids/Makefile@@ -2,11 +2,9 @@ include ../../scripts/Makefile.include include ../../scripts/Makefile.arch -ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(CURDIR))) srctree := $(patsubst %/,%,$(dir $(srctree))) srctree := $(patsubst %/,%,$(dir $(srctree))) -endif ifeq ($(V),1) Q =
@@ -22,6 +20,7 @@ AR = $(HOSTAR) CC = $(HOSTCC) LD = $(HOSTLD) ARCH = $(HOSTARCH) +RM ?= rm OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/
--
2.26.2