Commit 4f1127e2 authored by Sam Ravnborg's avatar Sam Ravnborg

kbuild: fix infinite make recursion

Jan Engelhardt <jengelh@computergmbh.de> reported:
You can cause a recursion in kbuild/make with the following:

make O=$PWD kernel/time.o
make mrproper

Of course no one would use O=$PWD (that's just the testcase),
but this happened too often:

/ws/linux/linux-2.6.23$ make O=/ws/linux/linux-2.6.23 kernel/time.o
(Oops - should have been O=/ws/linux/obj-2.6.23!)

Fixed by an explicit test for this case - we error
out if output directory and source directory are the same.
Tested-by: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent a67cb131
...@@ -115,7 +115,9 @@ saved-output := $(KBUILD_OUTPUT) ...@@ -115,7 +115,9 @@ saved-output := $(KBUILD_OUTPUT)
KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
$(if $(KBUILD_OUTPUT),, \ $(if $(KBUILD_OUTPUT),, \
$(error output directory "$(saved-output)" does not exist)) $(error output directory "$(saved-output)" does not exist))
# Check that OUTPUT directory is not the same as where we have kernel src
$(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \
$(error Output directory (O=...) specifies kernel src dir))
PHONY += $(MAKECMDGOALS) PHONY += $(MAKECMDGOALS)
$(filter-out _all,$(MAKECMDGOALS)) _all: $(filter-out _all,$(MAKECMDGOALS)) _all:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment