diff options
| author | Benjamin LaHaise <bcrl@kvack.org> | 2006-02-15 15:17:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 15:32:21 -0800 |
| commit | 36cbbe5eb9857730768aa5f54ad94d69e0b2133d (patch) | |
| tree | 19b894c7ef1bcdfa519a5c9ad6d1a35f71e99578 | |
| parent | 9f672004ab1a8094bec1785b39ac683ab9eebebc (diff) | |
| download | op-kernel-dev-36cbbe5eb9857730768aa5f54ad94d69e0b2133d.zip op-kernel-dev-36cbbe5eb9857730768aa5f54ad94d69e0b2133d.tar.gz | |
[PATCH] kbuild: revert "fix make -jN with multiple targets with O=..."
Commit 296e0855b0f9a4ec9be17106ac541745a55b2ce1:
"kbuild: fix make -jN with multiple targets with O=..."
causes a ~95% increase in build time for the kernel. Before: 4m21s
after: 8m1.403s. Can we revert this until another approach is found?
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -106,13 +106,12 @@ KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) $(if $(KBUILD_OUTPUT),, \ $(error output directory "$(saved-output)" does not exist)) -.PHONY: $(MAKECMDGOALS) cdbuilddir -$(MAKECMDGOALS) _all: cdbuilddir +.PHONY: $(MAKECMDGOALS) -cdbuilddir: +$(filter-out _all,$(MAKECMDGOALS)) _all: $(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \ KBUILD_SRC=$(CURDIR) \ - KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $(MAKECMDGOALS) + KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $@ # Leave processing to above invocation of make skip-makefile := 1 |
