perf tools: Add LIBDW_DIR Makefile variable to for alternate libdw

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Nov 14, 2012 perf events

Share & tools

tip-bot for Jiri Olsa

author

2012-11-14 07:34 UTC #0 lore raw

Commit-ID:  1fa0bc3f8d4f9bbcde5b1f962b006906cc80b2dc
Gitweb:     http://git.kernel.org/tip/1fa0bc3f8d4f9bbcde5b1f962b006906cc80b2dc
Author:     Jiri Olsa <[email protected]>
AuthorDate: Sat, 3 Nov 2012 19:27:57 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 8 Nov 2012 16:01:37 -0300

perf tools: Add LIBDW_DIR Makefile variable to for alternate libdw

Adding LIBDW_DIR Makefile variable to be able to specify alternate libdw library location.

To use it run make like:

  $ make LIBDW_DIR=/opt/libdw/

Signed-off-by Jiri Olsa <[email protected]>

Cc Arnaldo Carvalho de Melo <[email protected]>

Cc Corey Ashford <[email protected]>

Cc Frederic Weisbecker <[email protected]>

Cc Ingo Molnar <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Paul Mackerras <[email protected]>

Cc Peter Zijlstra <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/Makefile |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

tools/perf/Makefile +10 -2

index 4ffcd02..cca5bb8 100644
@@ -501,7 +501,14 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y)
 		msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static);
 	endif
 else
-	FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS)
+	# for linking with debug library, run like:
+	# make DEBUG=1 LIBDW_DIR=/opt/libdw/
+	ifdef LIBDW_DIR
+		LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
+		LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
+	endif
+
+	FLAGS_DWARF=$(ALL_CFLAGS) $(LIBDW_CFLAGS) -ldw -lelf $(LIBDW_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS)
 	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y)
 		msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);
 		NO_DWARF := 1

@@ -556,7 +563,8 @@ ifndef NO_DWARF
 ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
 	msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);
 else
-	BASIC_CFLAGS += -DDWARF_SUPPORT
+	BASIC_CFLAGS := -DDWARF_SUPPORT $(LIBDW_CFLAGS) $(BASIC_CFLAGS)
+	BASIC_LDFLAGS := $(LIBDW_LDFLAGS) $(BASIC_LDFLAGS)
 	EXTLIBS += -lelf -ldw
 	LIB_OBJS += $(OUTPUT)util/probe-finder.o
 	LIB_OBJS += $(OUTPUT)util/dwarf-aux.o