Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36cbbe5e authored by Benjamin LaHaise's avatar Benjamin LaHaise Committed by Linus Torvalds
Browse files

[PATCH] kbuild: revert "fix make -jN with multiple targets with O=..." 



Commit 296e0855:

    "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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9f672004

Makefile

+3 −4
Original line number Diff line number Diff line
@@ -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