diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-03-17 19:45:27 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-29 07:58:01 -0400 |
commit | 58a0abd7375fb41223a96f632f1450ec04ce6ff9 (patch) | |
tree | e0184922925ca5c06f5fa567a34af9ad31b9cbb1 /tools | |
parent | a1c7c9e7e989c3cf881f72f5d19010fd9890b115 (diff) |
perf tools: Move libnuma check config into config/Makefile
Moving libnuma check config into config/Makefile
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1369398928-9809-16-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Makefile | 9 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 11 |
2 files changed, 12 insertions, 8 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 9276576addc6..11525ac18bde 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -545,14 +545,7 @@ ifeq ($(NO_PERF_REGS),0) | |||
545 | endif | 545 | endif |
546 | 546 | ||
547 | ifndef NO_LIBNUMA | 547 | ifndef NO_LIBNUMA |
548 | FLAGS_LIBNUMA = $(ALL_CFLAGS) $(ALL_LDFLAGS) -lnuma | 548 | BUILTIN_OBJS += $(OUTPUT)bench/numa.o |
549 | ifneq ($(call try-cc,$(SOURCE_LIBNUMA),$(FLAGS_LIBNUMA),libnuma),y) | ||
550 | msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numa-libs-devel or libnuma-dev); | ||
551 | else | ||
552 | BASIC_CFLAGS += -DLIBNUMA_SUPPORT | ||
553 | BUILTIN_OBJS += $(OUTPUT)bench/numa.o | ||
554 | EXTLIBS += -lnuma | ||
555 | endif | ||
556 | endif | 549 | endif |
557 | 550 | ||
558 | ifdef ASCIIDOC8 | 551 | ifdef ASCIIDOC8 |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 8c0e43f16ea0..124c344bb23c 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -379,3 +379,14 @@ ifndef NO_BACKTRACE | |||
379 | BASIC_CFLAGS += -DBACKTRACE_SUPPORT | 379 | BASIC_CFLAGS += -DBACKTRACE_SUPPORT |
380 | endif | 380 | endif |
381 | endif | 381 | endif |
382 | |||
383 | ifndef NO_LIBNUMA | ||
384 | FLAGS_LIBNUMA = $(ALL_CFLAGS) $(ALL_LDFLAGS) -lnuma | ||
385 | ifneq ($(call try-cc,$(SOURCE_LIBNUMA),$(FLAGS_LIBNUMA),libnuma),y) | ||
386 | msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numa-libs-devel or libnuma-dev); | ||
387 | NO_LIBNUMA := 1 | ||
388 | else | ||
389 | BASIC_CFLAGS += -DLIBNUMA_SUPPORT | ||
390 | EXTLIBS += -lnuma | ||
391 | endif | ||
392 | endif | ||