diff options
author | Borislav Petkov <bp@suse.de> | 2013-02-20 10:32:28 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-03-15 12:05:59 -0400 |
commit | a50e43332756a5ac8d00f3367a54d9effeb9c674 (patch) | |
tree | 9a963b9ce7961e9a42c5129b721c6fc836bf35a8 | |
parent | fed1208841f5db92cc3bede4b1004e9e986d843e (diff) |
perf tools: Honor parallel jobs
We need to hand down parallel build options like the internal make
--jobserver-fds one so that parallel builds can also happen when
building perf from the toplevel directory.
Make it so #1!
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1361374353-30385-3-git-send-email-bp@alien8.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | tools/scripts/Makefile.include | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1331,11 +1331,11 @@ kernelversion: | |||
1331 | # Clear a bunch of variables before executing the submake | 1331 | # Clear a bunch of variables before executing the submake |
1332 | tools/: FORCE | 1332 | tools/: FORCE |
1333 | $(Q)mkdir -p $(objtree)/tools | 1333 | $(Q)mkdir -p $(objtree)/tools |
1334 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ | 1334 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ |
1335 | 1335 | ||
1336 | tools/%: FORCE | 1336 | tools/%: FORCE |
1337 | $(Q)mkdir -p $(objtree)/tools | 1337 | $(Q)mkdir -p $(objtree)/tools |
1338 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ $* | 1338 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $* |
1339 | 1339 | ||
1340 | # Single targets | 1340 | # Single targets |
1341 | # --------------------------------------------------------------------------- | 1341 | # --------------------------------------------------------------------------- |
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 2964b96aa55f..00a05f45b39a 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include | |||
@@ -70,7 +70,7 @@ ifndef V | |||
70 | QUIET_BISON = @echo ' ' BISON $@; | 70 | QUIET_BISON = @echo ' ' BISON $@; |
71 | 71 | ||
72 | descend = \ | 72 | descend = \ |
73 | @echo ' ' DESCEND $(1); \ | 73 | +@echo ' ' DESCEND $(1); \ |
74 | mkdir -p $(OUTPUT)$(1) && \ | 74 | mkdir -p $(OUTPUT)$(1) && \ |
75 | $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2) | 75 | $(MAKE) $(COMMAND_O) subdir=$(if $(subdir),$(subdir)/$(1),$(1)) $(PRINT_DIR) -C $(1) $(2) |
76 | endif | 76 | endif |