summaryrefslogtreecommitdiffstats
path: root/tools/perf/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-04 11:11:32 +0200
committerIngo Molnar <mingo@kernel.org>2013-10-09 08:49:01 +0200
commit684f434cc05a122938b75e055d7d799f1dd58d55 (patch)
tree62926486c6a31cd4a5aa761ae9b7ee002871e4ed /tools/perf/Makefile
parent1c2d1d8cf4dbef33b8c6af6888bed2f4e659220e (diff)
downloadop-kernel-dev-684f434cc05a122938b75e055d7d799f1dd58d55.zip
op-kernel-dev-684f434cc05a122938b75e055d7d799f1dd58d55.tar.gz
tools/perf/build: Exclude MAKEFLAGS from nested invocation
In case the user specifies MAKEFLAGS as an environment variable, or uses 'make -jN' explicitly, the options can conflict and result in: BUILD: Doing 'make -j8' parallel build make[1]: warning: -jN forced in submake: disabling jobserver mode. GEN common-cmds.h make[1]: *** write jobserver: Bad file descriptor. Stop. Make sure we invoke the main makefile in a pristine state. Users who want to do something non-standard can use the: make -f Makefile.perf method to invoke the makefile. Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/n/tip-uen6hzTvkqqngqwjma9yoEgw@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r--tools/perf/Makefile16
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 6f6f13a..74f52d8 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -1,3 +1,10 @@
+#
+# 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),
@@ -6,6 +13,11 @@
.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.
#
@@ -18,14 +30,12 @@ ifeq ($(JOBS),)
endif
endif
-export JOBS
-
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) $@
+ @$(MAKE) -f Makefile.perf --no-print-directory -j$(JOBS) O=$(O) $@
endef
#
OpenPOWER on IntegriCloud