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
Unified · Split
| @@ -657,6 +657,8 @@ export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ · 656 unmodified lines | ||
| 657 | 657 | |
| 658 | 658 | # Basic helpers built in scripts/basic/ |
| 659 | 659 | PHONY += scripts_basic |
| 660 | +scripts_basic: KBUILD_HOSTCFLAGS := $(KBUILD_HOSTCFLAGS) | |
| 661 | +scripts_basic: KBUILD_HOSTLDFLAGS := $(KBUILD_HOSTLDFLAGS) | |
| 660 | 662 | scripts_basic: |
| 661 | 663 | $(Q)$(MAKE) $(build)=scripts/basic |
| 662 | 664 | |
| @@ -139,7 +139,13 @@ install_kernel_headers () { · 138 unmodified lines | ||
| 139 | 139 | pdir=debian/$1 |
| 140 | 140 | version=${1#linux-headers-} |
| 141 | 141 | |
| 142 | − CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" | |
| 142 | + # Override $CC only for cross-compiles, to not unnecessarily rebuild | |
| 143 | + # scripts/ including plugins, which may lead to a full kernel rebuild. | |
| 144 | + if [ -n "${CROSS_COMPILE}" ]; then | |
| 145 | + CC="${DEB_HOST_GNU_TYPE}-gcc" "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" | |
| 146 | + else | |
| 147 | + "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" | |
| 148 | + fi | |
| 143 | 149 | |
| 144 | 150 | mkdir -p $pdir/lib/modules/$version/ |
| 145 | 151 | ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build |