On Thu, Dec 15, 2022 at 12:47:03PM +0800, Shen Jiamin wrote: > When libelf was not installed in the standard location, it cannot be > located by the current building config. > > Use pkg-config to help locate libelf in such cases. > > Signed-off-by: Shen Jiamin <shen_jiamin@xxxxxxxxxxxxxxx> Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx> thanks, jirka > --- > tools/bpf/resolve_btfids/Makefile | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile > index 19a3112e271a..f7375a119f54 100644 > --- a/tools/bpf/resolve_btfids/Makefile > +++ b/tools/bpf/resolve_btfids/Makefile > @@ -56,13 +56,17 @@ $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OU > DESTDIR=$(LIBBPF_DESTDIR) prefix= EXTRA_CFLAGS="$(CFLAGS)" \ > $(abspath $@) install_headers > > +LIBELF_FLAGS := $(shell $(HOSTPKG_CONFIG) libelf --cflags 2>/dev/null) > +LIBELF_LIBS := $(shell $(HOSTPKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf) > + > CFLAGS += -g \ > -I$(srctree)/tools/include \ > -I$(srctree)/tools/include/uapi \ > -I$(LIBBPF_INCLUDE) \ > - -I$(SUBCMD_SRC) > + -I$(SUBCMD_SRC) \ > + $(LIBELF_FLAGS) > > -LIBS = -lelf -lz > +LIBS = $(LIBELF_LIBS) -lz > > export srctree OUTPUT CFLAGS Q > include $(srctree)/tools/build/Makefile.include > -- > 2.34.1
