On Fri, Feb 5, 2021 at 4:46 AM Jiri Olsa <jolsa@xxxxxxxxxx> wrote: > > 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 changing the way how srctree is initialized as suggested > by Andrri. > > Also root Makefile does not define the implicit RM variable, > so adding RM initialization. > > Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx> > --- Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx> > tools/bpf/resolve_btfids/Makefile | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile > index be09ec4f03ff..bb9fa8de7e62 100644 > --- a/tools/bpf/resolve_btfids/Makefile > +++ b/tools/bpf/resolve_btfids/Makefile > @@ -2,11 +2,7 @@ > include ../../scripts/Makefile.include > include ../../scripts/Makefile.arch > > -ifeq ($(srctree),) > -srctree := $(patsubst %/,%,$(dir $(CURDIR))) > -srctree := $(patsubst %/,%,$(dir $(srctree))) > -srctree := $(patsubst %/,%,$(dir $(srctree))) > -endif > +srctree := $(abspath $(CURDIR)/../../../) > > ifeq ($(V),1) > Q = > @@ -22,6 +18,7 @@ AR = $(HOSTAR) > CC = $(HOSTCC) > LD = $(HOSTLD) > ARCH = $(HOSTARCH) > +RM ?= rm > > OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/ > > -- > 2.26.2 >
