diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-28 09:46:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-28 09:46:43 +0200 |
| commit | 1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (patch) | |
| tree | f33947a6603b406ba1e8b80114b2de313bcd9f09 /tools/perf/Makefile | |
| parent | ac2ba2b363a40a2431506d446985af4e4108b0d2 (diff) | |
| parent | aec1930b0f6f281a0ca038cd03aceace3fe0bb61 (diff) | |
| download | op-kernel-dev-1d787d37c8ff6612b8151c6dff15bfa7347bcbdf.zip op-kernel-dev-1d787d37c8ff6612b8151c6dff15bfa7347bcbdf.tar.gz | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Improve listing of accessible enum perf probe variables, from Hyeoncheol Lee.
* Don't stop the build if the audit libraries are not installed, fix from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/Makefile')
| -rw-r--r-- | tools/perf/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 251dcd7..e5e71e7 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -559,6 +559,19 @@ else LIB_OBJS += $(OUTPUT)util/unwind.o endif +ifdef NO_LIBAUDIT + BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT +else + FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit + ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT)),y) + msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); + BASIC_CFLAGS += -DNO_LIBAUDIT_SUPPORT + else + BUILTIN_OBJS += $(OUTPUT)builtin-trace.o + EXTLIBS += -laudit + endif +endif + ifdef NO_NEWT BASIC_CFLAGS += -DNO_NEWT_SUPPORT else |
