diff options
| author | Soramichi AKIYAMA <akiyama@m.soramichi.jp> | 2017-01-17 00:22:37 +0900 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-01-17 11:36:45 -0300 |
| commit | d25ed5d9fad98fd36ffca0bb5c3a0761a11e3f3c (patch) | |
| tree | cfb25013a0f63d563fe7414d5fc28a0490d30ba2 /tools/perf/Build | |
| parent | 587782c52a83b35673201fd9a54364fa2b189b33 (diff) | |
| download | blackbird-op-linux-d25ed5d9fad98fd36ffca0bb5c3a0761a11e3f3c.tar.gz blackbird-op-linux-d25ed5d9fad98fd36ffca0bb5c3a0761a11e3f3c.zip | |
perf tools: Move two variables usied in libperf from perf.c
The use_browser and perf_version_string variables are both declared in
perf.c but they are also referenced by other functions of libperf.a.
Therefore a user linking an own main() with libperf.a must declare those
two variables in their files even if the files never use the browser or
the version information.
This patch fixes this issue by moving use_browser and
perf_version_string out of perf.c to some other files.
Signed-off-by: Soramichi Akiyama <akiyama@m.soramichi.jp>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20170117002237.c1aec0ce3b4d675dca018deb@m.soramichi.jp
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/Build')
| -rw-r--r-- | tools/perf/Build | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/Build b/tools/perf/Build index 0b48806f93c2..7039ecb89170 100644 --- a/tools/perf/Build +++ b/tools/perf/Build @@ -40,8 +40,7 @@ CFLAGS_builtin-help.o += $(paths) CFLAGS_builtin-timechart.o += $(paths) CFLAGS_perf.o += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))" \ -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" \ - -DPREFIX="BUILD_STR($(prefix_SQ))" \ - -include $(OUTPUT)PERF-VERSION-FILE + -DPREFIX="BUILD_STR($(prefix_SQ))" CFLAGS_builtin-trace.o += -DSTRACE_GROUPS_DIR="BUILD_STR($(STRACE_GROUPS_DIR_SQ))" CFLAGS_builtin-report.o += -DTIPDIR="BUILD_STR($(tipdir_SQ))" CFLAGS_builtin-report.o += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)" |
