summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorSam Ravnborg <sam@saturn.ravnborg.org>2007-12-09 08:55:13 +0100
committerSam Ravnborg <sam@saturn.ravnborg.org>2007-12-09 08:55:13 +0100
commit18c32dac75b187d1a4e858f3cfdf03e844129f5e (patch)
treec41a33a7077356c0e75fcbe40ecb49890d506051 /Makefile
parent1cacc9ab8bf10e60b3ed93d7a10b070c4cbc6c9f (diff)
downloadlinux-18c32dac75b187d1a4e858f3cfdf03e844129f5e.tar.bz2
kbuild: fix building with O=.. options
The check introduced in commit: 4f1127e204377cbd2a56d112d323466f668e8334 "kbuild: fix infinite make recursion" caused certain external modules not to build and also caused 'make targz-pkg' to fail. This is a minimal fix so we revert to previous behaviour - but we do not overwrite the Makefile in the top-level directory. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Tested-by: Jay Cliburn <jacliburn@bellsouth.net> Cc: Jay Cliburn <jacliburn@bellsouth.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index a5252f451bfd..7fb1a2c08305 100644
--- a/Makefile
+++ b/Makefile
@@ -118,9 +118,6 @@ saved-output := $(KBUILD_OUTPUT)
KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
$(if $(KBUILD_OUTPUT),, \
$(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) sub-make