Commit 7aec51cb authored Aug 12, 2015 by Andi Kleen Committed by Arnaldo Carvalho de Melo Aug 13, 2015

perf tools: Support static linking with libdw

The Fedora 22 version of libdw requires a couple of extra libraries to
link. With a dynamic link the dependencies are pulled in automatically,
but this doesn't work for static linking. Add the needed libraries
explicitely to the feature probe and the Makefile.

v2: Explicitly check for static linking and only add the dependencies
when -static is set. This is to avoid regressions on Arnaldo's system.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/1439419717-20601-1-git-send-email-andi@firstfloor.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent a897b5f0

tools/build/feature/Makefile

+6 −1

Original line number	Diff line number	Diff line
		@@ -70,8 +70,13 @@ test-libelf.bin:
		test-glibc.bin:
		$(BUILD)

		DWARFLIBS := -ldw
		ifeq ($(findstring -static,${LDFLAGS}),-static)
		DWARFLIBS += -lelf -lebl -lz -llzma -lbz2
		endif

		test-dwarf.bin:
		$(BUILD) -ldw
		$(BUILD) $(DWARFLIBS)

		test-libelf-mmap.bin:
		$(BUILD) -lelf

tools/perf/config/Makefile

+5 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,11 @@ ifndef NO_LIBELF
		else
		CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
		LDFLAGS += $(LIBDW_LDFLAGS)
		EXTLIBS += -ldw
		DWARFLIBS := -ldw
		ifeq ($(findstring -static,${LDFLAGS}),-static)
		DWARFLIBS += -lelf -lebl -lz -llzma -lbz2
		endif
		EXTLIBS += ${DWARFLIBS}
		$(call detected,CONFIG_DWARF)
		endif # PERF_HAVE_DWARF_REGS
		endif # NO_DWARF