diff --git a/debian/changelog b/debian/changelog index 7102aaea3..87ed82abe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,8 @@ linux (4.17.6-2) UNRELEASED; urgency=medium * debian/rules.real: Pass KERNEL_ARCH variable down to debian/rules.d * debian/rules.d/tools/perf/Makefile: Use KERNEL_ARCH variable * linux-kbuild: Fix the assumed host architecture for cross-built objtool - (fixes FTBFS on at least ppc64) + * [ppc64] linux-bootwrapper: Work around compiler include path quirk + (fixes FTBFS) -- Ben Hutchings Thu, 12 Jul 2018 15:16:15 +0100 diff --git a/debian/rules.d/arch/powerpc/boot/Makefile b/debian/rules.d/arch/powerpc/boot/Makefile index ab8e9d74f..9dc418f26 100644 --- a/debian/rules.d/arch/powerpc/boot/Makefile +++ b/debian/rules.d/arch/powerpc/boot/Makefile @@ -9,3 +9,10 @@ SCRIPTS = \ include $(top_rulesdir)/Makefile.inc CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +# gcc for ppc64 currently seems to be treating -I like -isystem, and +# since arch/powerpc/boot has substitute versions of some standard +# headers for use at boot time, they are also included in these tools. +# In this case there is actually no need to use the -I option, so +# filter it out. +CPPFLAGS := $(filter-out -I%,$(CPPFLAGS))