Skip to content

Commit b935117

Browse files
committed
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
2 parents 2ff1bc4 + 75f7c47 commit b935117

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,8 @@ export RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
657657

658658
# Basic helpers built in scripts/basic/
659659
PHONY += scripts_basic
660+
scripts_basic: KBUILD_HOSTCFLAGS := $(KBUILD_HOSTCFLAGS)
661+
scripts_basic: KBUILD_HOSTLDFLAGS := $(KBUILD_HOSTLDFLAGS)
660662
scripts_basic:
661663
$(Q)$(MAKE) $(build)=scripts/basic
662664

scripts/package/builddeb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,13 @@ install_kernel_headers () {
139139
pdir=debian/$1
140140
version=${1#linux-headers-}
141141

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
143149

144150
mkdir -p $pdir/lib/modules/$version/
145151
ln -s /usr/src/linux-headers-$version $pdir/lib/modules/$version/build

0 commit comments

Comments
 (0)