projects/linux·commit b6eea87f

x86, boot: Explicitly include autoconf.h for hostprogs

b6eea87f · Matt Fleming <[email protected]> · 2012-10-12 11:19:59 +01:00

The hostprogs need access to the CONFIG_* symbols found in
include/generated/autoconf.h.  But commit abbf1590de22 ("UAPI: Partition
the header include path sets and add uapi/ header directories") replaced
$(LINUXINCLUDE) with $(USERINCLUDE) which doesn't contain the necessary
include paths.

This has the undesirable effect of breaking the EFI boot stub because
the #ifdef CONFIG_EFI_STUB code in arch/x86/boot/tools/build.c is
never compiled.

It should also be noted that because $(USERINCLUDE) isn't exported by
the top-level Makefile it's actually empty in arch/x86/boot/Makefile.

Cc: H. Peter Anvin <[email protected]>
Cc: Ingo Molnar <[email protected]>
Acked-by: David Howells <[email protected]>
Signed-off-by: Matt Fleming <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
b6eea87fc6850d3531a64a27d2323a4498cd4e43
Parents
7d380c8f

Changes

1 files changed · +2 −1

FileStatusAddDelContent
arch/x86/boot/Makefilemodified+2−1View file

arch/x86/boot/Makefile

View file
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index ce03476..ccce0ed 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -37,7 +37,8 @@ setup-y += video-bios.o
targets += $(setup-y)
hostprogs-y := mkcpustr tools/build
-HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \
+HOST_EXTRACFLAGS += -I$(srctree)/tools/include \
+ -include include/generated/autoconf.h \
-D__EXPORTED_HEADERS__
$(obj)/cpu.o: $(obj)/cpustr.h