[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2c529e4e6aab405aa52e8627cbd691ed28b56a0b@git.kernel.org>
Date: Mon, 14 Apr 2014 07:52:47 -0700
From: tip-bot for Ramkumar Ramachandra <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, acme@...hat.com, hpa@...or.com,
mingo@...nel.org, jean.pihet@...aro.org, jolsa@...hat.com,
tglx@...utronix.de, artagnon@...il.com
Subject: [tip:perf/urgent] perf tools:
Pick up libdw without explicit LIBDW_DIR
Commit-ID: 2c529e4e6aab405aa52e8627cbd691ed28b56a0b
Gitweb: http://git.kernel.org/tip/2c529e4e6aab405aa52e8627cbd691ed28b56a0b
Author: Ramkumar Ramachandra <artagnon@...il.com>
AuthorDate: Wed, 26 Mar 2014 18:44:05 -0400
Committer: Jiri Olsa <jolsa@...hat.com>
CommitDate: Mon, 14 Apr 2014 12:55:17 +0200
perf tools: Pick up libdw without explicit LIBDW_DIR
The Makefile logic sets FEATURE_CHECKS_CFLAGS-libdw-dwarf-unwind and
FEATURE_CHECKS_LDFLAGS-libdw-dwarf-unwind only if LIBDW_DIR is
defined. This means that under a normal setup,
$ make NO_LIBUNWIND=1
won't automatically pick up libdw. Fix this.
Signed-off-by: Ramkumar Ramachandra <artagnon@...il.com>
Acked-by: Jean Pihet <jean.pihet@...aro.org>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Link: http://lkml.kernel.org/r/1395873845-466-1-git-send-email-artagnon@gmail.com
Signed-off-by: Jiri Olsa <jolsa@...hat.com>
---
tools/perf/config/Makefile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 5a3c452..ee21fa9 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -65,10 +65,9 @@ ifndef NO_LIBELF
ifdef LIBDW_DIR
LIBDW_CFLAGS := -I$(LIBDW_DIR)/include
LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
-
- FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
- FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
endif
+ FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
+ FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
endif
# include ARCH specific config
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists