Skip to content

Commit b6eea87

Browse files
Matt Flemingtorvalds
authored andcommitted
x86, boot: Explicitly include autoconf.h for hostprogs
The hostprogs need access to the CONFIG_* symbols found in include/generated/autoconf.h. But commit abbf159 ("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]>
1 parent 7d380c8 commit b6eea87

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/boot/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ setup-y += video-bios.o
3737
targets += $(setup-y)
3838
hostprogs-y := mkcpustr tools/build
3939

40-
HOST_EXTRACFLAGS += -I$(srctree)/tools/include $(USERINCLUDE) \
40+
HOST_EXTRACFLAGS += -I$(srctree)/tools/include \
41+
-include include/generated/autoconf.h \
4142
-D__EXPORTED_HEADERS__
4243

4344
$(obj)/cpu.o: $(obj)/cpustr.h

0 commit comments

Comments
 (0)