Skip to content

Commit 818e419

Browse files
jadams41gregkh
authored andcommitted
perf build: Fix out of tree build related to installation of sysreg-defs
[ Upstream commit efae55b ] It seems that a previous modification to sysreg-defs, which corrected emitting the header 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: a29ee6a ("perf build: Ensure sysreg-defs Makefile respects output dir") Reviewed-by: Oliver Upton <[email protected]> Reviewed-by: Tycho Andersen <[email protected]> Signed-off-by: Ethan Adams <[email protected]> Tested-by: Tycho Andersen <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 1b4861e commit 818e419

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

tools/perf/Makefile.perf

+4-3
Original file line numberDiff line numberDiff line change
@@ -458,18 +458,19 @@ SHELL = $(SHELL_PATH)
458458

459459
arm64_gen_sysreg_dir := $(srctree)/tools/arch/arm64/tools
460460
ifneq ($(OUTPUT),)
461-
arm64_gen_sysreg_outdir := $(OUTPUT)
461+
arm64_gen_sysreg_outdir := $(abspath $(OUTPUT))
462462
else
463463
arm64_gen_sysreg_outdir := $(CURDIR)
464464
endif
465465

466466
arm64-sysreg-defs: FORCE
467-
$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir)
467+
$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir) \
468+
prefix= subdir=
468469

469470
arm64-sysreg-defs-clean:
470471
$(call QUIET_CLEAN,arm64-sysreg-defs)
471472
$(Q)$(MAKE) -C $(arm64_gen_sysreg_dir) O=$(arm64_gen_sysreg_outdir) \
472-
clean > /dev/null
473+
prefix= subdir= clean > /dev/null
473474

474475
beauty_linux_dir := $(srctree)/tools/perf/trace/beauty/include/linux/
475476
linux_uapi_dir := $(srctree)/tools/include/uapi/linux

0 commit comments

Comments
 (0)