Skip to content

Commit 40efc87

Browse files
james-c-linaronamhyung
authored andcommitted
perf jevents: Fix build when there are other json files in the tree
The unquoted glob *.json will expand to a real file if, for example, there is any file in the Perf source ending in .json. This can happen when using tools like Bear and clangd which generate a compile_commands.json file. With the glob already expanded by the shell, the find command will fail to wildcard any real json events files. Fix it by wrapping the star in quotes so it's passed to find rather than the shell. This fixes the following build error (most of the diff output omitted): $ make V=1 -C tools/perf O=/tmp/perf_build_with_json TEST /tmp/perf_build_with_json/pmu-events/empty-pmu-events.log ... /* offset=121053 */ "node-access\000legacy cache\000Local memory read accesses\000legacy-cache-config=6\000\00010\000\000\000\000\000" /* offset=121135 */ "node-misses\000legacy cache\000Local memory read misses\000legacy-cache-config=0x10006\000\00010\000\000\000\000\000" /* offset=121221 */ "node-miss\000legacy cache\000Local memory read misses\000legacy-cache-config=0x10006\000\00010\000\000\000\000\000" ... - { .event_table = { 0, 0 }, .metric_table = { 0, 0 }, }, make[3]: *** [pmu-events/Build:54: /tmp/perf_build_with_json/pmu-events/empty-pmu-events.log] Error 1 Fixes: 4bb55de ("perf jevents: Support copying the source json files to OUTPUT") Signed-off-by: James Clark <james.clark@linaro.org> Reviewed-by: Leo Yan <leo.yan@arm.com> Tested-by: Leo Yan <leo.yan@arm.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
1 parent 8002019 commit 40efc87

File tree

1 file changed

+1
-1
lines changed
  • tools/perf/pmu-events

1 file changed

+1
-1
lines changed

tools/perf/pmu-events/Build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pmu-events-y += pmu-events.o
22
JDIR = pmu-events/arch/$(SRCARCH)
3-
JSON = $(shell find pmu-events/arch -name *.json -o -name *.csv)
3+
JSON = $(shell find pmu-events/arch -name '*.json' -o -name '*.csv')
44
JDIR_TEST = pmu-events/arch/test
55
JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \
66
find $(JDIR_TEST) -name '*.json')

0 commit comments

Comments
 (0)