| Message ID | 20210224130046.346977-1-antonio.terceiro@linaro.org |
|---|---|
| State | Accepted |
| Commit | dacfc08dcafa7d443ab339592999e37bbb8a3ef0 |
| Headers | show |
| Series | perf: fix ccache usage in $(CC) when generating arch errno table | expand |
Em Wed, Feb 24, 2021 at 10:00:46AM -0300, Antonio Terceiro escreveu: > This was introduced by commit e4ffd066ff440a57097e9140fa9e16ceef905de8. > > Assuming the first word of $(CC) is the actual compiler breaks usage > like CC="ccache gcc": the script ends up calling ccache directly with > gcc arguments, what fails. Instead of getting the first word, just > remove from $(CC) any word that starts with a "-". This maintains the > spirit of the original patch, while not breaking ccache users. Thanks, tested, added: Fixes: e4ffd066ff440a57 ("perf: Normalize gcc parameter when generating arch errno table") And applied to perf/urgent. - Arnaldo > Signed-off-by: Antonio Terceiro <antonio.terceiro@linaro.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Arnaldo Carvalho de Melo <acme@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Cc: Jiri Olsa <jolsa@redhat.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: He Zhe <zhe.he@windriver.com> > CC: stable@vger.kernel.org > --- > tools/perf/Makefile.perf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index 5345ac70cd83..9bfc725db608 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -607,7 +607,7 @@ arch_errno_hdr_dir := $(srctree)/tools > arch_errno_tbl := $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh > > $(arch_errno_name_array): $(arch_errno_tbl) > - $(Q)$(SHELL) '$(arch_errno_tbl)' $(firstword $(CC)) $(arch_errno_hdr_dir) > $@ > + $(Q)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC))' $(arch_errno_hdr_dir) > $@ > > sync_file_range_arrays := $(beauty_outdir)/sync_file_range_arrays.c > sync_file_range_tbls := $(srctree)/tools/perf/trace/beauty/sync_file_range.sh > -- > 2.30.1 > -- - Arnaldo
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5345ac70cd83..9bfc725db608 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -607,7 +607,7 @@ arch_errno_hdr_dir := $(srctree)/tools arch_errno_tbl := $(srctree)/tools/perf/trace/beauty/arch_errno_names.sh $(arch_errno_name_array): $(arch_errno_tbl) - $(Q)$(SHELL) '$(arch_errno_tbl)' $(firstword $(CC)) $(arch_errno_hdr_dir) > $@ + $(Q)$(SHELL) '$(arch_errno_tbl)' '$(patsubst -%,,$(CC))' $(arch_errno_hdr_dir) > $@ sync_file_range_arrays := $(beauty_outdir)/sync_file_range_arrays.c sync_file_range_tbls := $(srctree)/tools/perf/trace/beauty/sync_file_range.sh
This was introduced by commit e4ffd066ff440a57097e9140fa9e16ceef905de8. Assuming the first word of $(CC) is the actual compiler breaks usage like CC="ccache gcc": the script ends up calling ccache directly with gcc arguments, what fails. Instead of getting the first word, just remove from $(CC) any word that starts with a "-". This maintains the spirit of the original patch, while not breaking ccache users. Signed-off-by: Antonio Terceiro <antonio.terceiro@linaro.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: He Zhe <zhe.he@windriver.com> CC: stable@vger.kernel.org --- tools/perf/Makefile.perf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.1