aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-10-13 16:04:23 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-13 08:35:39 -0700
commit0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174 (patch)
treeb3e3a8ac99b6ab265858b616a7f750e871c524ed
parente0fafda36a2fc5ecf8d11771f6c01c523b2a1fd8 (diff)
downloadlinux-0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174.tar.gz
[PATCH] Fix headers_check for O= builds; disable automatic check on UML.
* make header_check work with O= Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f242829c4f0bd8..eebf310e8ce455 100644
--- a/Makefile
+++ b/Makefile
@@ -742,7 +742,7 @@ endif # ifdef CONFIG_KALLSYMS
# vmlinux image - including updated kernel symbols
vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
ifdef CONFIG_HEADERS_CHECK
- $(Q)$(MAKE) headers_check
+ $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
endif
$(call if_changed_rule,vmlinux__)
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
@@ -935,7 +935,7 @@ headers_install_all: include/linux/version.h scripts_basic FORCE
PHONY += headers_install
headers_install: include/linux/version.h scripts_basic FORCE
- @if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \
+ @if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
exit 1 ; fi
$(Q)$(MAKE) $(build)=scripts scripts/unifdef