mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
be40920fbf
When I tried to compile tools/perf from the top directory with the -C
option, the O= option didn't work correctly if I passed a relative path:
$ make O=BUILD -C tools/perf/
make: Entering directory '/home/mhiramat/ksrc/linux/tools/perf'
BUILD: Doing 'make -j8' parallel build
../scripts/Makefile.include:4: *** O=/home/mhiramat/ksrc/linux/tools/perf/BUILD does not exist. Stop.
make: *** [Makefile:70: all] Error 2
make: Leaving directory '/home/mhiramat/ksrc/linux/tools/perf'
The O= directory existence check failed because the check script ran in
the build target directory instead of the directory where I ran the make
command.
To fix that, once change directory to $(PWD) and check O= directory,
since the PWD is set to where the make command runs.
Fixes: c883122acc ("perf tools: Let O= makes handle relative paths")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: stable@vger.kernel.org
Link: http://lore.kernel.org/lkml/158351957799.3363.15269768530697526765.stgit@devnote2
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
113 lines
2.5 KiB
Makefile
113 lines
2.5 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# This is a simple wrapper Makefile that calls the main Makefile.perf
|
|
# with a -j option to do parallel builds
|
|
#
|
|
# If you want to invoke the perf build in some non-standard way then
|
|
# you can use the 'make -f Makefile.perf' method to invoke it.
|
|
#
|
|
|
|
#
|
|
# Clear out the built-in rules GNU make defines by default (such as .o targets),
|
|
# so that we pass through all targets to Makefile.perf:
|
|
#
|
|
.SUFFIXES:
|
|
|
|
#
|
|
# We don't want to pass along options like -j:
|
|
#
|
|
unexport MAKEFLAGS
|
|
|
|
#
|
|
# Do a parallel build with multiple jobs, based on the number of CPUs online
|
|
# in this system: 'make -j8' on a 8-CPU system, etc.
|
|
#
|
|
# (To override it, run 'make JOBS=1' and similar.)
|
|
#
|
|
ifeq ($(JOBS),)
|
|
JOBS := $(shell (getconf _NPROCESSORS_ONLN || egrep -c '^processor|^CPU[0-9]' /proc/cpuinfo) 2>/dev/null)
|
|
ifeq ($(JOBS),0)
|
|
JOBS := 1
|
|
endif
|
|
endif
|
|
|
|
#
|
|
# Only pass canonical directory names as the output directory:
|
|
#
|
|
ifneq ($(O),)
|
|
FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O))
|
|
endif
|
|
|
|
#
|
|
# Only accept the 'DEBUG' variable from the command line:
|
|
#
|
|
ifeq ("$(origin DEBUG)", "command line")
|
|
ifeq ($(DEBUG),)
|
|
override DEBUG = 0
|
|
else
|
|
SET_DEBUG = "DEBUG=$(DEBUG)"
|
|
endif
|
|
else
|
|
override DEBUG = 0
|
|
endif
|
|
|
|
define print_msg
|
|
@printf ' BUILD: Doing '\''make \033[33m-j'$(JOBS)'\033[m'\'' parallel build\n'
|
|
endef
|
|
|
|
define make
|
|
@$(MAKE) -f Makefile.perf --no-print-directory -j$(JOBS) O=$(FULL_O) $(SET_DEBUG) $@
|
|
endef
|
|
|
|
#
|
|
# Needed if no target specified:
|
|
# (Except for tags and TAGS targets. The reason is that the
|
|
# Makefile does not treat tags/TAGS as targets but as files
|
|
# and thus won't rebuilt them once they are in place.)
|
|
#
|
|
all tags TAGS:
|
|
$(print_msg)
|
|
$(make)
|
|
|
|
ifdef MAKECMDGOALS
|
|
has_clean := 0
|
|
ifneq ($(filter clean,$(MAKECMDGOALS)),)
|
|
has_clean := 1
|
|
endif # clean
|
|
|
|
ifeq ($(has_clean),1)
|
|
rest := $(filter-out clean,$(MAKECMDGOALS))
|
|
ifneq ($(rest),)
|
|
$(rest): clean
|
|
endif # rest
|
|
endif # has_clean
|
|
endif # MAKECMDGOALS
|
|
|
|
#
|
|
# Explicitly disable parallelism for the clean target.
|
|
#
|
|
clean:
|
|
$(make) -j1
|
|
|
|
#
|
|
# The build-test target is not really parallel, don't print the jobs info,
|
|
# it also uses only the tests/make targets that don't pollute the source
|
|
# repository, i.e. that uses O= or builds the tarpkg outside the source
|
|
# repo directories.
|
|
#
|
|
# For a full test, use:
|
|
#
|
|
# make -C tools/perf -f tests/make
|
|
#
|
|
build-test:
|
|
@$(MAKE) SHUF=1 -f tests/make REUSE_FEATURES_DUMP=1 MK=Makefile SET_PARALLEL=1 --no-print-directory tarpkg out
|
|
|
|
#
|
|
# All other targets get passed through:
|
|
#
|
|
%: FORCE
|
|
$(print_msg)
|
|
$(make)
|
|
|
|
.PHONY: tags TAGS FORCE Makefile
|