aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse2006-10-13 10:04:23 -0500
committerLinus Torvalds2006-10-13 10:35:39 -0500
commit0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174 (patch)
treeb3e3a8ac99b6ab265858b616a7f750e871c524ed /Makefile
parente0fafda36a2fc5ecf8d11771f6c01c523b2a1fd8 (diff)
downloadkernel-0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174.tar.gz
kernel-0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174.tar.xz
kernel-0e7af8d04ecb4f6ba8cd1f731f036a004ad0e174.zip
[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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f242829c4f0b..eebf310e8ce4 100644
--- a/Makefile
+++ b/Makefile
@@ -742,7 +742,7 @@ endif # ifdef CONFIG_KALLSYMS
742# vmlinux image - including updated kernel symbols 742# vmlinux image - including updated kernel symbols
743vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE 743vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) $(kallsyms.o) FORCE
744ifdef CONFIG_HEADERS_CHECK 744ifdef CONFIG_HEADERS_CHECK
745 $(Q)$(MAKE) headers_check 745 $(Q)$(MAKE) -f $(srctree)/Makefile headers_check
746endif 746endif
747 $(call if_changed_rule,vmlinux__) 747 $(call if_changed_rule,vmlinux__)
748 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@ 748 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $@
@@ -935,7 +935,7 @@ headers_install_all: include/linux/version.h scripts_basic FORCE
935 935
936PHONY += headers_install 936PHONY += headers_install
937headers_install: include/linux/version.h scripts_basic FORCE 937headers_install: include/linux/version.h scripts_basic FORCE
938 @if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \ 938 @if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
939 echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \ 939 echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
940 exit 1 ; fi 940 exit 1 ; fi
941 $(Q)$(MAKE) $(build)=scripts scripts/unifdef 941 $(Q)$(MAKE) $(build)=scripts scripts/unifdef