Skip to content

Commit

Permalink
tools lib api: Add str_error_c to libapi
Browse files Browse the repository at this point in the history
Because it uses that function, which would lead every tool using it
to need to link against tools/lib/str_error_r.o.

This fixes building tools/vm/, that links with libapi.

Reported-by: Arjan van de Ven <arjan@linux.intel.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Fixes: b31e3e3 ("tools lib api fs: Use str_error_r()")
Link: http://lkml.kernel.org/n/tip-aedt3qzibhnhaov2j4caqi61@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jul 27, 2016
1 parent e4b3e06 commit 8149a77
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
5 changes: 5 additions & 0 deletions tools/lib/api/Build
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ libapi-y += fd/
libapi-y += fs/
libapi-y += cpu.o
libapi-y += debug.o
libapi-y += str_error_r.o

$(OUTPUT)str_error_r.o: ../str_error_r.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
5 changes: 0 additions & 5 deletions tools/perf/util/Build
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ libperf-y += stat.o
libperf-y += stat-shadow.o
libperf-y += record.o
libperf-y += srcline.o
libperf-y += str_error_r.o
libperf-y += data.o
libperf-y += tsc.o
libperf-y += cloexec.o
Expand Down Expand Up @@ -176,10 +175,6 @@ $(OUTPUT)util/libstring.o: ../lib/string.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)

$(OUTPUT)util/str_error_r.o: ../lib/str_error_r.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)

$(OUTPUT)util/hweight.o: ../lib/hweight.c FORCE
$(call rule_mkdir)
$(call if_changed_dep,cc_o_c)
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/python-ext-sources
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ util/cpumap.c
../lib/bitmap.c
../lib/find_bit.c
../lib/hweight.c
../lib/str_error_r.c
../lib/vsprintf.c
util/thread_map.c
util/util.c
Expand Down

0 comments on commit 8149a77

Please sign in to comment.