Commit 140332b6 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: fix linux-headers package build when $(CC) cannot link userspace 



Since commit 5f73e7d0 ("kbuild: refactor cross-compiling
linux-headers package"), the linux-headers Debian package fails to
build when $(CC) cannot build userspace applications, for example,
when using toolchains installed by the 0day bot.

The host programs in the linux-headers package should be rebuilt using
the disto's cross-compiler, ${DEB_HOST_GNU_TYPE}-gcc instead of $(CC).
Hence, the variable 'CC' must be expanded in this shell script instead
of in the top-level Makefile.

Commit f354fc88 ("kbuild: install-extmod-build: add missing
quotation marks for CC variable") was not a correct fix because
CC="ccache gcc" should be unrelated when rebuilding userspace tools.

Fixes: 5f73e7d0 ("kbuild: refactor cross-compiling linux-headers package")
Reported-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
Closes: https://lore.kernel.org/linux-kbuild/CAK7LNARb3xO3ptBWOMpwKcyf3=zkfhMey5H2KnB1dOmUwM79dA@mail.gmail.com/T/#t


Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Tested-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent d1d09631

scripts/package/install-extmod-build

+2 −2
Original line number Diff line number Diff line
@@ -62,8 +62,8 @@ if [ "${CC}" != "${HOSTCC}" ]; then 
	#

	# Clear VPATH and srcroot because the source files reside in the output

	# directory.

	# shellcheck disable=SC2016 # $(MAKE), $(CC), and $(build) will be expanded by Make

	"${MAKE}" run-command KBUILD_RUN_COMMAND='+$(MAKE) HOSTCC="$(CC)" VPATH= srcroot=. $(build)='"${destdir}"/scripts

	# shellcheck disable=SC2016 # $(MAKE) and $(build) will be expanded by Make

	"${MAKE}" run-command KBUILD_RUN_COMMAND='+$(MAKE) HOSTCC='"${CC}"' VPATH= srcroot=. $(build)='"${destdir}"/scripts



	rm -f "${destdir}/scripts/Kbuild"

fi