diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-09-30 08:11:46 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 02:48:33 -0400 |
commit | 78e9d6550807aedfc1f81c199bd4681c09d80ac5 (patch) | |
tree | 54b634afe96893a4c5c23bfaf3676484f84db50b /tools/perf/config/Makefile | |
parent | 1ea6f99efd8ae61fce68c97a9cf9f722cfbca3ad (diff) |
tools/perf/build: Split out feature check: 'bionic'
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-xjfVewprrfhlo2wuzbnpVb1k@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/config/Makefile')
-rw-r--r-- | tools/perf/config/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 7a614f92ce8c..09e2ecc4b056 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -107,6 +107,7 @@ FEATURE_TESTS = \ | |||
107 | stackprotector \ | 107 | stackprotector \ |
108 | volatile-register-var \ | 108 | volatile-register-var \ |
109 | fortify-source \ | 109 | fortify-source \ |
110 | bionic \ | ||
110 | libnuma | 111 | libnuma |
111 | 112 | ||
112 | $(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test))) | 113 | $(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test))) |
@@ -150,12 +151,13 @@ CFLAGS += -I$(LIB_INCLUDE) | |||
150 | CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE | 151 | CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE |
151 | 152 | ||
152 | ifndef NO_BIONIC | 153 | ifndef NO_BIONIC |
153 | ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y) | 154 | $(feature_check,bionic) |
154 | BIONIC := 1 | 155 | ifeq ($(feature-bionic), 1) |
155 | EXTLIBS := $(filter-out -lrt,$(EXTLIBS)) | 156 | BIONIC := 1 |
156 | EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) | 157 | EXTLIBS := $(filter-out -lrt,$(EXTLIBS)) |
158 | EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) | ||
159 | endif | ||
157 | endif | 160 | endif |
158 | endif # NO_BIONIC | ||
159 | 161 | ||
160 | ifdef NO_LIBELF | 162 | ifdef NO_LIBELF |
161 | NO_DWARF := 1 | 163 | NO_DWARF := 1 |