diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-14 14:10:08 +0200 |
commit | cf230918cda19532e4a5cc4f0d5c82fa7e5e94f6 (patch) | |
tree | 9eed06e09fbbe3764f47e4da7f8d15b5965f6cb3 /tools/perf/config/Makefile | |
parent | 4cdf77a828b056258f48a9f6078bd2f77d9704bb (diff) | |
parent | 4ba96195051be30160af6d5f5f83f9a055ab1f23 (diff) |
Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/config/Makefile')
-rw-r--r-- | tools/perf/config/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 4f100b54ba8b..f30ac5e5d271 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -299,7 +299,11 @@ else NO_LIBUNWIND := 1 NO_LIBDW_DWARF_UNWIND := 1 else - msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static); + ifneq ($(filter s% -static%,$(LDFLAGS),),) + msg := $(error No static glibc found, please install glibc-static); + else + msg := $(error No gnu/libc-version.h found, please install glibc-dev[el]); + endif endif else ifndef NO_LIBDW_DWARF_UNWIND |