* [PATCH] perf build: fix out of tree build
@ 2024-03-14 22:20 Ethan Adams
2024-03-18 17:24 ` Oliver Upton
0 siblings, 1 reply; 3+ messages in thread
From: Ethan Adams @ 2024-03-14 22:20 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Ian Rogers,
Adrian Hunter, Oliver Upton, linux-perf-users, linux-kernel,
Ethan Adams, Tycho Andersen
It seems that a previous modification to sysreg-defs, which corrected
emitting the headaer to the specified output directory, exposed missing
subdir, prefix variables. This breaks out of tree builds of perf as the
file is now built into the output directory, but still tries to descend
into output directory as a subdir.
Fixes: a29ee6aea703 ("perf build: Ensure sysreg-defs Makefile respects output dir")
Tested-by: Tycho Andersen <tycho@tycho.pizza>
Reviewed-by: Tycho Andersen <tycho@tycho.pizza>
Signed-off-by: Ethan Adams <j.ethan.adams@gmail.com>
---
tools/perf/Makefile.perf | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 058c9aecf608..63a8b4be5075 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -436,18 +436,19 @@ SHELL = $(SHELL_PATH)
arm64_gen_sysreg_dir := $(srctree)/tools/arch/arm64/tools
ifneq ($(OUTPUT),)
- arm64_gen_sysreg_outdir := $(OUTPUT)
+ arm64_gen_sysreg_outdir := $(abspath $(OUTPUT))
else
arm64_gen_sysreg_outdir := $(CURDIR)
endif
arm64-sysreg-defs: FORCE
- $(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir)
+ $(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir) \
+ prefix= subdir=
arm64-sysreg-defs-clean:
$(call QUIET_CLEAN,arm64-sysreg-defs)
$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir) \
- clean > /dev/null
+ prefix= subdir= clean > /dev/null
beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/
linux_uapi_dir := $(srctree)/tools/include/uapi/linux
base-commit: e365762bb26770b53d2475852453bed76c0d85f9
--
2.43.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] perf build: fix out of tree build
2024-03-14 22:20 [PATCH] perf build: fix out of tree build Ethan Adams
@ 2024-03-18 17:24 ` Oliver Upton
2024-03-18 21:25 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Upton @ 2024-03-18 17:24 UTC (permalink / raw)
To: Ethan Adams
Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Ian Rogers, Adrian Hunter, linux-perf-users, linux-kernel,
Tycho Andersen
On Thu, Mar 14, 2024 at 03:20:12PM -0700, Ethan Adams wrote:
> It seems that a previous modification to sysreg-defs, which corrected
> emitting the headaer to the specified output directory, exposed missing
typo: header
> subdir, prefix variables. This breaks out of tree builds of perf as the
> file is now built into the output directory, but still tries to descend
> into output directory as a subdir.
>
> Fixes: a29ee6aea703 ("perf build: Ensure sysreg-defs Makefile respects output dir")
> Tested-by: Tycho Andersen <tycho@tycho.pizza>
> Reviewed-by: Tycho Andersen <tycho@tycho.pizza>
> Signed-off-by: Ethan Adams <j.ethan.adams@gmail.com>
Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
--
Thanks,
Oliver
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] perf build: fix out of tree build
2024-03-18 17:24 ` Oliver Upton
@ 2024-03-18 21:25 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2024-03-18 21:25 UTC (permalink / raw)
To: Oliver Upton
Cc: Ethan Adams, Peter Zijlstra, Ingo Molnar, Mark Rutland,
Alexander Shishkin, Jiri Olsa, Namhyung Kim, Ian Rogers,
Adrian Hunter, linux-perf-users, linux-kernel, Tycho Andersen
On Mon, Mar 18, 2024 at 05:24:56PM +0000, Oliver Upton wrote:
> On Thu, Mar 14, 2024 at 03:20:12PM -0700, Ethan Adams wrote:
> > It seems that a previous modification to sysreg-defs, which corrected
> > emitting the headaer to the specified output directory, exposed missing
>
> typo: header
fixed
> > subdir, prefix variables. This breaks out of tree builds of perf as the
> > file is now built into the output directory, but still tries to descend
> > into output directory as a subdir.
> >
> > Fixes: a29ee6aea703 ("perf build: Ensure sysreg-defs Makefile respects output dir")
> > Tested-by: Tycho Andersen <tycho@tycho.pizza>
> > Reviewed-by: Tycho Andersen <tycho@tycho.pizza>
> > Signed-off-by: Ethan Adams <j.ethan.adams@gmail.com>
>
> Reviewed-by: Oliver Upton <oliver.upton@linux.dev>
Thanks, applied to perf-tools-next,
- Arnaldo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-18 21:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-14 22:20 [PATCH] perf build: fix out of tree build Ethan Adams
2024-03-18 17:24 ` Oliver Upton
2024-03-18 21:25 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).