Commit b935117f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux 

Pull Kbuild fixes from Nicolas Schier:

 - builddeb - avoid recompiles for non-cross-compiles

   Avoid triggering complete rebuilds for non-cross-compile Debian
   package builds by only triggering the rebuild of host tools for
   actual cross-compile builds

 - Never respect CONFIG_WERROR / W=e to fixdep

   Avoid spurious rebuilds of fixdep w/ and w/o -Werror during a single
   kbuild invocation by never respecting CONFIG_WERROR for fixdep

* tag 'kbuild-fixes-7.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  kbuild: Never respect CONFIG_WERROR / W=e to fixdep
  kbuild: builddeb - avoid recompiles for non-cross-compiles
parents 2ff1bc41 75f7c47c

Makefile

+2 −0
Original line number Diff line number Diff line
@@ -657,6 +657,8 @@ export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ 


# Basic helpers built in scripts/basic/

PHONY += scripts_basic

scripts_basic: KBUILD_HOSTCFLAGS := $(KBUILD_HOSTCFLAGS)

scripts_basic: KBUILD_HOSTLDFLAGS := $(KBUILD_HOSTLDFLAGS)

scripts_basic:

	$(Q)$(MAKE) $(build)=scripts/basic

scripts/package/builddeb

+7 −1
Original line number Diff line number Diff line
@@ -139,7 +139,13 @@ install_kernel_headers () { 
	pdir=debian/$1

	version=${1#linux-headers-}



	# Override $CC only for cross-compiles, to not unnecessarily rebuild

	# scripts/ including plugins, which may lead to a full kernel rebuild.

	if [ -n "${CROSS_COMPILE}" ]; then

		CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}"

	else

		"${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}"

	fi



	mkdir -p $pdir/lib/modules/$version/

	ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build