From 0d9f874161d4a1a531f6668b64329850bcfd0196 Mon Sep 17 00:00:00 2001 From: Mike Galbraith Date: Sat, 8 Aug 2009 14:14:15 +0200 Subject: [PATCH] --- yaml --- r: 156635 b: refs/heads/master c: 183f3b0887083d36c8a25cd5e3518906415d1889 h: refs/heads/master i: 156633: f2643ce03a667b6347067d437fbe2cf73ffe38c0 156631: 20d611b4300d6e9e055255fbf36f1147f7b64f0c v: v3 --- [refs] | 2 +- trunk/tools/perf/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 59351d5f46f6..2b3701ca34d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c24b513337f06712b8c81eb4f1413d44591dfee7 +refs/heads/master: 183f3b0887083d36c8a25cd5e3518906415d1889 diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile index 1916e44b9bb0..60411e94113b 100644 --- a/trunk/tools/perf/Makefile +++ b/trunk/tools/perf/Makefile @@ -387,10 +387,14 @@ else has_bfd_iberty := $(shell sh -c "(echo '\#include '; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y") + has_bfd_iberty_z := $(shell sh -c "(echo '\#include '; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y") + ifeq ($(has_bfd),y) EXTLIBS += -lbfd else ifeq ($(has_bfd_iberty),y) EXTLIBS += -lbfd -liberty + else ifeq ($(has_bfd_iberty_z),y) + EXTLIBS += -lbfd -liberty -lz else msg := $(warning No bfd.h/libbfd found, install binutils-dev[el] to gain symbol demangling) BASIC_CFLAGS += -DNO_DEMANGLE