aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-07 04:30:47 -0400
committerIngo Molnar <mingo@kernel.org>2013-10-09 02:48:38 -0400
commit308e1e700a1337b89c7530a4f4cdde5ccb52fb4e (patch)
treee975212161b494ef899d283c51d12a9da7068335
parentb7bcef6f8e61580e883672b6c97148d4f89e9874 (diff)
tools/perf/build: Clean up the libunwind logic in config/Makefile
Nest the rules properly. No change in functionality. Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/n/tip-jjlmizjmhockUs04wqnScnkl@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--tools/perf/config/Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 718b47611340..0d7558790a02 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -240,19 +240,19 @@ ifneq ($(ARCH),x86)
240endif 240endif
241 241
242ifndef NO_LIBUNWIND 242ifndef NO_LIBUNWIND
243# for linking with debug library, run like: 243 # for linking with debug library, run like:
244# make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/ 244 # make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/
245ifdef LIBUNWIND_DIR 245 ifdef LIBUNWIND_DIR
246 LIBUNWIND_CFLAGS := -I$(LIBUNWIND_DIR)/include 246 LIBUNWIND_CFLAGS := -I$(LIBUNWIND_DIR)/include
247 LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib 247 LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib
248endif 248 endif
249 249
250FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(CFLAGS) $(LIBUNWIND_LDFLAGS) $(LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS) 250 FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(CFLAGS) $(LIBUNWIND_LDFLAGS) $(LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS)
251ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y) 251 ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y)
252 msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99); 252 msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99);
253 NO_LIBUNWIND := 1 253 NO_LIBUNWIND := 1
254endif # Libunwind support 254 endif
255endif # NO_LIBUNWIND 255endif
256 256
257ifndef NO_LIBUNWIND 257ifndef NO_LIBUNWIND
258 CFLAGS += -DHAVE_LIBUNWIND_SUPPORT 258 CFLAGS += -DHAVE_LIBUNWIND_SUPPORT