Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e7af8d0 authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

[PATCH] Fix headers_check for O= builds; disable automatic check on UML. 



 * make header_check work with O=

Signed-off-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e0fafda3

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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