Commit 224e7451 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-v6.14-2' of... 

Merge tag 'kbuild-fixes-v6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Fix annoying logs when building tools in parallel

 - Fix the Debian linux-headers package build again

 - Fix the target triple detection for userspace programs on Clang

* tag 'kbuild-fixes-v6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  modpost: Fix a few typos in a comment
  kbuild: userprogs: fix bitsize and target detection on clang
  kbuild: fix linux-headers package build when $(CC) cannot link userspace
  tools: fix annoying "mkdir -p ..." logs when building tools in parallel
parents ae5fa8ce b28fb1f2

Makefile

+4 −9
Original line number Diff line number Diff line
@@ -1120,8 +1120,8 @@ LDFLAGS_vmlinux += --orphan-handling=$(CONFIG_LD_ORPHAN_WARN_LEVEL) 
endif



# Align the bit size of userspace programs with the kernel

KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))

KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))

KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))



# make the checker run with the right architecture

CHECKFLAGS += --arch=$(ARCH)
@@ -1421,18 +1421,13 @@ ifneq ($(wildcard $(resolve_btfids_O)),) 
	$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean

endif



# Clear a bunch of variables before executing the submake

ifeq ($(quiet),silent_)

tools_silent=s

endif



tools/: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/

	$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/



tools/%: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*

	$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*



# ---------------------------------------------------------------------------

# Kernel selftest

scripts/mod/modpost.c

+2 −2
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ static struct module *new_module(const char *name, size_t namelen) 


	/*

	 * Set mod->is_gpl_compatible to true by default. If MODULE_LICENSE()

	 * is missing, do not check the use for EXPORT_SYMBOL_GPL() becasue

	 * modpost will exit wiht error anyway.

	 * is missing, do not check the use for EXPORT_SYMBOL_GPL() because

	 * modpost will exit with an error anyway.

	 */

	mod->is_gpl_compatible = true;

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