Commit 5b84ad2e authored Aug 30, 2019 by Quentin Monnet Committed by Daniel Borkmann Aug 31, 2019

tools: bpftool: do not link twice against libbpf.a in Makefile



In bpftool's Makefile, $(LIBS) includes $(LIBBPF), therefore the library
is used twice in the linking command. No need to have $(LIBBPF) (from
$^) on that command, let's do with "$(OBJS) $(LIBS)" (but move $(LIBBPF)
_before_ the -l flags in $(LIBS)).

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Quentin Monnet <quentin.monnet@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent fbdb620b

tools/bpf/bpftool/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ ifneq ($(EXTRA_LDFLAGS),)
		LDFLAGS += $(EXTRA_LDFLAGS)
		endif

		LIBS = -lelf -lz $(LIBBPF)
		LIBS = $(LIBBPF) -lelf -lz

		INSTALL ?= install
		RM ?= rm -f
		@@ -117,7 +117,7 @@ $(OUTPUT)disasm.o: $(srctree)/kernel/bpf/disasm.c
		$(OUTPUT)feature.o: \| zdep

		$(OUTPUT)bpftool: $(OBJS) $(LIBBPF)
		$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
		$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)

		$(OUTPUT)%.o: %.c
		$(QUIET_CC)$(COMPILE.c) -MMD -o $@ $<

Admin message