diff options
| author | Sam Ravnborg <sam@saturn.ravnborg.org> | 2007-12-09 02:55:13 -0500 |
|---|---|---|
| committer | Sam Ravnborg <sam@saturn.ravnborg.org> | 2007-12-09 02:55:13 -0500 |
| commit | 18c32dac75b187d1a4e858f3cfdf03e844129f5e (patch) | |
| tree | c41a33a7077356c0e75fcbe40ecb49890d506051 /Makefile | |
| parent | 1cacc9ab8bf10e60b3ed93d7a10b070c4cbc6c9f (diff) | |
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-- | Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
| @@ -118,9 +118,6 @@ saved-output := $(KBUILD_OUTPUT) | |||
| 118 | KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) | 118 | KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd) |
| 119 | $(if $(KBUILD_OUTPUT),, \ | 119 | $(if $(KBUILD_OUTPUT),, \ |
| 120 | $(error output directory "$(saved-output)" does not exist)) | 120 | $(error output directory "$(saved-output)" does not exist)) |
| 121 | # Check that OUTPUT directory is not the same as where we have kernel src | ||
| 122 | $(if $(filter-out $(KBUILD_OUTPUT),$(shell /bin/pwd)),, \ | ||
| 123 | $(error Output directory (O=...) specifies kernel src dir)) | ||
| 124 | 121 | ||
| 125 | PHONY += $(MAKECMDGOALS) sub-make | 122 | PHONY += $(MAKECMDGOALS) sub-make |
| 126 | 123 | ||