diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-03-21 06:30:54 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-05-30 09:12:03 -0400 |
commit | 9c12cf95b32a099ac92ef0e9d138acb4bef984be (patch) | |
tree | a1ee33ebba9c8871efaae786ea7bd03d7d1274ad /tools/perf/config | |
parent | 0817df08d31cd961be225e601d8ec92acac62027 (diff) |
perf tools: Merge all *CFLAGS* make variable into CFLAGS
Merging all *CFLAGS* make variable into CFLAGS to eliminate all special
*_CFLAGS_* variables and make the setup clear.
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-19-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/config')
-rw-r--r-- | tools/perf/config/Makefile | 104 |
1 files changed, 55 insertions, 49 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 506c47976861..a53d2b37831a 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -6,6 +6,7 @@ ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | |||
6 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ | 6 | -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ |
7 | -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) | 7 | -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ ) |
8 | NO_PERF_REGS := 1 | 8 | NO_PERF_REGS := 1 |
9 | CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) | ||
9 | 10 | ||
10 | # Additional ARCH settings for x86 | 11 | # Additional ARCH settings for x86 |
11 | ifeq ($(ARCH),i386) | 12 | ifeq ($(ARCH),i386) |
@@ -17,12 +18,12 @@ endif | |||
17 | ifeq ($(ARCH),x86_64) | 18 | ifeq ($(ARCH),x86_64) |
18 | override ARCH := x86 | 19 | override ARCH := x86 |
19 | IS_X86_64 := 0 | 20 | IS_X86_64 := 0 |
20 | ifeq (, $(findstring m32,$(EXTRA_CFLAGS))) | 21 | ifeq (, $(findstring m32,$(CFLAGS))) |
21 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) | 22 | IS_X86_64 := $(shell echo __x86_64__ | ${CC} -E -x c - | tail -n 1) |
22 | endif | 23 | endif |
23 | ifeq (${IS_X86_64}, 1) | 24 | ifeq (${IS_X86_64}, 1) |
24 | RAW_ARCH := x86_64 | 25 | RAW_ARCH := x86_64 |
25 | ARCH_CFLAGS := -DARCH_X86_64 | 26 | CFLAGS += -DARCH_X86_64 |
26 | ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S | 27 | ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S |
27 | endif | 28 | endif |
28 | NO_PERF_REGS := 0 | 29 | NO_PERF_REGS := 0 |
@@ -30,7 +31,7 @@ ifeq ($(ARCH),x86_64) | |||
30 | endif | 31 | endif |
31 | 32 | ||
32 | ifeq ($(NO_PERF_REGS),0) | 33 | ifeq ($(NO_PERF_REGS),0) |
33 | BASIC_CFLAGS += -DHAVE_PERF_REGS | 34 | CFLAGS += -DHAVE_PERF_REGS |
34 | endif | 35 | endif |
35 | 36 | ||
36 | -include config/feature-tests.mak | 37 | -include config/feature-tests.mak |
@@ -45,46 +46,52 @@ endif | |||
45 | 46 | ||
46 | # Treat warnings as errors unless directed not to | 47 | # Treat warnings as errors unless directed not to |
47 | ifneq ($(WERROR),0) | 48 | ifneq ($(WERROR),0) |
48 | CFLAGS_WERROR := -Werror | 49 | CFLAGS += -Werror |
49 | endif | 50 | endif |
50 | 51 | ||
51 | ifeq ("$(origin DEBUG)", "command line") | 52 | ifeq ("$(origin DEBUG)", "command line") |
52 | PERF_DEBUG = $(DEBUG) | 53 | PERF_DEBUG = $(DEBUG) |
53 | endif | 54 | endif |
54 | ifndef PERF_DEBUG | 55 | ifndef PERF_DEBUG |
55 | CFLAGS_OPTIMIZE = -O6 | 56 | CFLAGS += -O6 |
56 | endif | 57 | endif |
57 | 58 | ||
58 | ifdef PARSER_DEBUG | 59 | ifdef PARSER_DEBUG |
59 | PARSER_DEBUG_BISON := -t | 60 | PARSER_DEBUG_BISON := -t |
60 | PARSER_DEBUG_FLEX := -d | 61 | PARSER_DEBUG_FLEX := -d |
61 | PARSER_DEBUG_CFLAGS := -DPARSER_DEBUG | 62 | CFLAGS += -DPARSER_DEBUG |
62 | endif | 63 | endif |
63 | 64 | ||
64 | CFLAGS = -fno-omit-frame-pointer -ggdb3 -funwind-tables -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) $(EXTRA_WARNINGS) $(EXTRA_CFLAGS) $(PARSER_DEBUG_CFLAGS) | 65 | CFLAGS += \ |
66 | -fno-omit-frame-pointer \ | ||
67 | -ggdb3 \ | ||
68 | -funwind-tables \ | ||
69 | -Wall \ | ||
70 | -Wextra \ | ||
71 | -std=gnu99 | ||
72 | |||
65 | EXTLIBS = -lpthread -lrt -lelf -lm | 73 | EXTLIBS = -lpthread -lrt -lelf -lm |
66 | ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE | ||
67 | ALL_LDFLAGS = $(LDFLAGS) | 74 | ALL_LDFLAGS = $(LDFLAGS) |
68 | 75 | ||
69 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y) | 76 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -fstack-protector-all,-fstack-protector-all),y) |
70 | CFLAGS := $(CFLAGS) -fstack-protector-all | 77 | CFLAGS += -fstack-protector-all |
71 | endif | 78 | endif |
72 | 79 | ||
73 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector,-Wstack-protector),y) | 80 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector,-Wstack-protector),y) |
74 | CFLAGS := $(CFLAGS) -Wstack-protector | 81 | CFLAGS += -Wstack-protector |
75 | endif | 82 | endif |
76 | 83 | ||
77 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var,-Wvolatile-register-var),y) | 84 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wvolatile-register-var,-Wvolatile-register-var),y) |
78 | CFLAGS := $(CFLAGS) -Wvolatile-register-var | 85 | CFLAGS += -Wvolatile-register-var |
79 | endif | 86 | endif |
80 | 87 | ||
81 | ifndef PERF_DEBUG | 88 | ifndef PERF_DEBUG |
82 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -D_FORTIFY_SOURCE=2,-D_FORTIFY_SOURCE=2),y) | 89 | ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -D_FORTIFY_SOURCE=2,-D_FORTIFY_SOURCE=2),y) |
83 | CFLAGS := $(CFLAGS) -D_FORTIFY_SOURCE=2 | 90 | CFLAGS += -D_FORTIFY_SOURCE=2 |
84 | endif | 91 | endif |
85 | endif | 92 | endif |
86 | 93 | ||
87 | BASIC_CFLAGS += \ | 94 | CFLAGS += \ |
88 | -Iutil/include \ | 95 | -Iutil/include \ |
89 | -Iarch/$(ARCH)/include \ | 96 | -Iarch/$(ARCH)/include \ |
90 | $(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \ | 97 | $(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \ |
@@ -106,7 +113,6 @@ ifeq ($(call try-cc,$(SOURCE_BIONIC),$(CFLAGS),bionic),y) | |||
106 | BIONIC := 1 | 113 | BIONIC := 1 |
107 | EXTLIBS := $(filter-out -lrt,$(EXTLIBS)) | 114 | EXTLIBS := $(filter-out -lrt,$(EXTLIBS)) |
108 | EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) | 115 | EXTLIBS := $(filter-out -lpthread,$(EXTLIBS)) |
109 | BASIC_CFLAGS += -I. | ||
110 | endif | 116 | endif |
111 | 117 | ||
112 | ifdef NO_LIBELF | 118 | ifdef NO_LIBELF |
@@ -114,9 +120,9 @@ ifdef NO_LIBELF | |||
114 | NO_DEMANGLE := 1 | 120 | NO_DEMANGLE := 1 |
115 | NO_LIBUNWIND := 1 | 121 | NO_LIBUNWIND := 1 |
116 | else | 122 | else |
117 | FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) | 123 | FLAGS_LIBELF=$(CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) |
118 | ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y) | 124 | ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF),libelf),y) |
119 | FLAGS_GLIBC=$(ALL_CFLAGS) $(ALL_LDFLAGS) | 125 | FLAGS_GLIBC=$(CFLAGS) $(ALL_LDFLAGS) |
120 | ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y) | 126 | ifeq ($(call try-cc,$(SOURCE_GLIBC),$(FLAGS_GLIBC),glibc),y) |
121 | LIBC_SUPPORT := 1 | 127 | LIBC_SUPPORT := 1 |
122 | endif | 128 | endif |
@@ -140,7 +146,7 @@ else | |||
140 | LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib | 146 | LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib |
141 | endif | 147 | endif |
142 | 148 | ||
143 | FLAGS_DWARF=$(ALL_CFLAGS) $(LIBDW_CFLAGS) -ldw -lelf $(LIBDW_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) | 149 | FLAGS_DWARF=$(CFLAGS) $(LIBDW_CFLAGS) -ldw -lelf $(LIBDW_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) |
144 | ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y) | 150 | ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF),libdw),y) |
145 | msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev); | 151 | msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev); |
146 | NO_DWARF := 1 | 152 | NO_DWARF := 1 |
@@ -149,10 +155,10 @@ endif # SOURCE_LIBELF | |||
149 | endif # NO_LIBELF | 155 | endif # NO_LIBELF |
150 | 156 | ||
151 | ifndef NO_LIBELF | 157 | ifndef NO_LIBELF |
152 | BASIC_CFLAGS += -DLIBELF_SUPPORT | 158 | CFLAGS += -DLIBELF_SUPPORT |
153 | FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) | 159 | FLAGS_LIBELF=$(CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) |
154 | ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y) | 160 | ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y) |
155 | BASIC_CFLAGS += -DLIBELF_MMAP | 161 | CFLAGS += -DLIBELF_MMAP |
156 | endif | 162 | endif |
157 | 163 | ||
158 | # include ARCH specific config | 164 | # include ARCH specific config |
@@ -163,7 +169,7 @@ ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) | |||
163 | msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); | 169 | msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); |
164 | NO_DWARF := 1 | 170 | NO_DWARF := 1 |
165 | else | 171 | else |
166 | BASIC_CFLAGS := -DDWARF_SUPPORT $(LIBDW_CFLAGS) $(BASIC_CFLAGS) | 172 | CFLAGS += -DDWARF_SUPPORT $(LIBDW_CFLAGS) |
167 | BASIC_LDFLAGS := $(LIBDW_LDFLAGS) $(BASIC_LDFLAGS) | 173 | BASIC_LDFLAGS := $(LIBDW_LDFLAGS) $(BASIC_LDFLAGS) |
168 | EXTLIBS += -lelf -ldw | 174 | EXTLIBS += -lelf -ldw |
169 | endif # PERF_HAVE_DWARF_REGS | 175 | endif # PERF_HAVE_DWARF_REGS |
@@ -184,7 +190,7 @@ ifdef LIBUNWIND_DIR | |||
184 | LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib | 190 | LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib |
185 | endif | 191 | endif |
186 | 192 | ||
187 | FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(ALL_CFLAGS) $(LIBUNWIND_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS) | 193 | FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(CFLAGS) $(LIBUNWIND_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS) |
188 | ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y) | 194 | ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND),libunwind),y) |
189 | msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99); | 195 | msg := $(warning No libunwind found, disabling post unwind support. Please install libunwind-dev[el] >= 0.99); |
190 | NO_LIBUNWIND := 1 | 196 | NO_LIBUNWIND := 1 |
@@ -192,19 +198,19 @@ endif # Libunwind support | |||
192 | endif # NO_LIBUNWIND | 198 | endif # NO_LIBUNWIND |
193 | 199 | ||
194 | ifndef NO_LIBUNWIND | 200 | ifndef NO_LIBUNWIND |
195 | BASIC_CFLAGS += -DLIBUNWIND_SUPPORT | 201 | CFLAGS += -DLIBUNWIND_SUPPORT |
196 | EXTLIBS += $(LIBUNWIND_LIBS) | 202 | EXTLIBS += $(LIBUNWIND_LIBS) |
197 | BASIC_CFLAGS := $(LIBUNWIND_CFLAGS) $(BASIC_CFLAGS) | 203 | CFLAGS += $(LIBUNWIND_CFLAGS) |
198 | BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS) | 204 | BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS) |
199 | endif # NO_LIBUNWIND | 205 | endif # NO_LIBUNWIND |
200 | 206 | ||
201 | ifndef NO_LIBAUDIT | 207 | ifndef NO_LIBAUDIT |
202 | FLAGS_LIBAUDIT = $(ALL_CFLAGS) $(ALL_LDFLAGS) -laudit | 208 | FLAGS_LIBAUDIT = $(CFLAGS) $(ALL_LDFLAGS) -laudit |
203 | ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y) | 209 | ifneq ($(call try-cc,$(SOURCE_LIBAUDIT),$(FLAGS_LIBAUDIT),libaudit),y) |
204 | msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); | 210 | msg := $(warning No libaudit.h found, disables 'trace' tool, please install audit-libs-devel or libaudit-dev); |
205 | NO_LIBAUDIT := 1 | 211 | NO_LIBAUDIT := 1 |
206 | else | 212 | else |
207 | BASIC_CFLAGS += -DLIBAUDIT_SUPPORT | 213 | CFLAGS += -DLIBAUDIT_SUPPORT |
208 | EXTLIBS += -laudit | 214 | EXTLIBS += -laudit |
209 | endif | 215 | endif |
210 | endif | 216 | endif |
@@ -214,29 +220,29 @@ ifdef NO_NEWT | |||
214 | endif | 220 | endif |
215 | 221 | ||
216 | ifndef NO_SLANG | 222 | ifndef NO_SLANG |
217 | FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang | 223 | FLAGS_SLANG=$(CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang |
218 | ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y) | 224 | ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y) |
219 | msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev); | 225 | msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev); |
220 | NO_SLANG := 1 | 226 | NO_SLANG := 1 |
221 | else | 227 | else |
222 | # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h | 228 | # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h |
223 | BASIC_CFLAGS += -I/usr/include/slang | 229 | CFLAGS += -I/usr/include/slang |
224 | BASIC_CFLAGS += -DSLANG_SUPPORT | 230 | CFLAGS += -DSLANG_SUPPORT |
225 | EXTLIBS += -lslang | 231 | EXTLIBS += -lslang |
226 | endif | 232 | endif |
227 | endif | 233 | endif |
228 | 234 | ||
229 | ifndef NO_GTK2 | 235 | ifndef NO_GTK2 |
230 | FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) | 236 | FLAGS_GTK2=$(CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) |
231 | ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2),gtk2),y) | 237 | ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2),gtk2),y) |
232 | msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev); | 238 | msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev); |
233 | NO_GTK2 := 1 | 239 | NO_GTK2 := 1 |
234 | else | 240 | else |
235 | ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y) | 241 | ifeq ($(call try-cc,$(SOURCE_GTK2_INFOBAR),$(FLAGS_GTK2),-DHAVE_GTK_INFO_BAR),y) |
236 | BASIC_CFLAGS += -DHAVE_GTK_INFO_BAR | 242 | CFLAGS += -DHAVE_GTK_INFO_BAR |
237 | endif | 243 | endif |
238 | BASIC_CFLAGS += -DGTK2_SUPPORT | 244 | CFLAGS += -DGTK2_SUPPORT |
239 | BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) | 245 | CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) |
240 | EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null) | 246 | EXTLIBS += $(shell pkg-config --libs gtk+-2.0 2>/dev/null) |
241 | endif | 247 | endif |
242 | endif | 248 | endif |
@@ -245,7 +251,7 @@ grep-libs = $(filter -l%,$(1)) | |||
245 | strip-libs = $(filter-out -l%,$(1)) | 251 | strip-libs = $(filter-out -l%,$(1)) |
246 | 252 | ||
247 | ifdef NO_LIBPERL | 253 | ifdef NO_LIBPERL |
248 | BASIC_CFLAGS += -DNO_LIBPERL | 254 | CFLAGS += -DNO_LIBPERL |
249 | else | 255 | else |
250 | PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null) | 256 | PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null) |
251 | PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS)) | 257 | PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS)) |
@@ -254,7 +260,7 @@ else | |||
254 | FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS) | 260 | FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS) |
255 | 261 | ||
256 | ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED),perl),y) | 262 | ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED),perl),y) |
257 | BASIC_CFLAGS += -DNO_LIBPERL | 263 | CFLAGS += -DNO_LIBPERL |
258 | NO_LIBPERL := 1 | 264 | NO_LIBPERL := 1 |
259 | else | 265 | else |
260 | ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS) | 266 | ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS) |
@@ -264,7 +270,7 @@ endif | |||
264 | 270 | ||
265 | disable-python = $(eval $(disable-python_code)) | 271 | disable-python = $(eval $(disable-python_code)) |
266 | define disable-python_code | 272 | define disable-python_code |
267 | BASIC_CFLAGS += -DNO_LIBPYTHON | 273 | CFLAGS += -DNO_LIBPYTHON |
268 | $(if $(1),$(warning No $(1) was found)) | 274 | $(if $(1),$(warning No $(1) was found)) |
269 | $(warning Python support will not be built) | 275 | $(warning Python support will not be built) |
270 | NO_LIBPYTHON := 1 | 276 | NO_LIBPYTHON := 1 |
@@ -326,13 +332,13 @@ else | |||
326 | endif | 332 | endif |
327 | 333 | ||
328 | ifdef NO_DEMANGLE | 334 | ifdef NO_DEMANGLE |
329 | BASIC_CFLAGS += -DNO_DEMANGLE | 335 | CFLAGS += -DNO_DEMANGLE |
330 | else | 336 | else |
331 | ifdef HAVE_CPLUS_DEMANGLE | 337 | ifdef HAVE_CPLUS_DEMANGLE |
332 | EXTLIBS += -liberty | 338 | EXTLIBS += -liberty |
333 | BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE | 339 | CFLAGS += -DHAVE_CPLUS_DEMANGLE |
334 | else | 340 | else |
335 | FLAGS_BFD=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -DPACKAGE='perf' -lbfd | 341 | FLAGS_BFD=$(CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -DPACKAGE='perf' -lbfd |
336 | has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD),libbfd) | 342 | has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD),libbfd) |
337 | ifeq ($(has_bfd),y) | 343 | ifeq ($(has_bfd),y) |
338 | EXTLIBS += -lbfd | 344 | EXTLIBS += -lbfd |
@@ -347,14 +353,14 @@ else | |||
347 | ifeq ($(has_bfd_iberty_z),y) | 353 | ifeq ($(has_bfd_iberty_z),y) |
348 | EXTLIBS += -lbfd -liberty -lz | 354 | EXTLIBS += -lbfd -liberty -lz |
349 | else | 355 | else |
350 | FLAGS_CPLUS_DEMANGLE=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -liberty | 356 | FLAGS_CPLUS_DEMANGLE=$(CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -liberty |
351 | has_cplus_demangle := $(call try-cc,$(SOURCE_CPLUS_DEMANGLE),$(FLAGS_CPLUS_DEMANGLE),demangle) | 357 | has_cplus_demangle := $(call try-cc,$(SOURCE_CPLUS_DEMANGLE),$(FLAGS_CPLUS_DEMANGLE),demangle) |
352 | ifeq ($(has_cplus_demangle),y) | 358 | ifeq ($(has_cplus_demangle),y) |
353 | EXTLIBS += -liberty | 359 | EXTLIBS += -liberty |
354 | BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE | 360 | CFLAGS += -DHAVE_CPLUS_DEMANGLE |
355 | else | 361 | else |
356 | msg := $(warning No bfd.h/libbfd found, install binutils-dev[el]/zlib-static to gain symbol demangling) | 362 | msg := $(warning No bfd.h/libbfd found, install binutils-dev[el]/zlib-static to gain symbol demangling) |
357 | BASIC_CFLAGS += -DNO_DEMANGLE | 363 | CFLAGS += -DNO_DEMANGLE |
358 | endif | 364 | endif |
359 | endif | 365 | endif |
360 | endif | 366 | endif |
@@ -364,29 +370,29 @@ endif | |||
364 | 370 | ||
365 | ifndef NO_STRLCPY | 371 | ifndef NO_STRLCPY |
366 | ifeq ($(call try-cc,$(SOURCE_STRLCPY),,-DHAVE_STRLCPY),y) | 372 | ifeq ($(call try-cc,$(SOURCE_STRLCPY),,-DHAVE_STRLCPY),y) |
367 | BASIC_CFLAGS += -DHAVE_STRLCPY | 373 | CFLAGS += -DHAVE_STRLCPY |
368 | endif | 374 | endif |
369 | endif | 375 | endif |
370 | 376 | ||
371 | ifndef NO_ON_EXIT | 377 | ifndef NO_ON_EXIT |
372 | ifeq ($(call try-cc,$(SOURCE_ON_EXIT),,-DHAVE_ON_EXIT),y) | 378 | ifeq ($(call try-cc,$(SOURCE_ON_EXIT),,-DHAVE_ON_EXIT),y) |
373 | BASIC_CFLAGS += -DHAVE_ON_EXIT | 379 | CFLAGS += -DHAVE_ON_EXIT |
374 | endif | 380 | endif |
375 | endif | 381 | endif |
376 | 382 | ||
377 | ifndef NO_BACKTRACE | 383 | ifndef NO_BACKTRACE |
378 | ifeq ($(call try-cc,$(SOURCE_BACKTRACE),,-DBACKTRACE_SUPPORT),y) | 384 | ifeq ($(call try-cc,$(SOURCE_BACKTRACE),,-DBACKTRACE_SUPPORT),y) |
379 | BASIC_CFLAGS += -DBACKTRACE_SUPPORT | 385 | CFLAGS += -DBACKTRACE_SUPPORT |
380 | endif | 386 | endif |
381 | endif | 387 | endif |
382 | 388 | ||
383 | ifndef NO_LIBNUMA | 389 | ifndef NO_LIBNUMA |
384 | FLAGS_LIBNUMA = $(ALL_CFLAGS) $(ALL_LDFLAGS) -lnuma | 390 | FLAGS_LIBNUMA = $(CFLAGS) $(ALL_LDFLAGS) -lnuma |
385 | ifneq ($(call try-cc,$(SOURCE_LIBNUMA),$(FLAGS_LIBNUMA),libnuma),y) | 391 | 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); | 392 | msg := $(warning No numa.h found, disables 'perf bench numa mem' benchmark, please install numa-libs-devel or libnuma-dev); |
387 | NO_LIBNUMA := 1 | 393 | NO_LIBNUMA := 1 |
388 | else | 394 | else |
389 | BASIC_CFLAGS += -DLIBNUMA_SUPPORT | 395 | CFLAGS += -DLIBNUMA_SUPPORT |
390 | EXTLIBS += -lnuma | 396 | EXTLIBS += -lnuma |
391 | endif | 397 | endif |
392 | endif | 398 | endif |