On Tue, Oct 14, 2025 at 03:05:17PM +0200, Thomas Weißschuh wrote: > The command to invoke scripts/cc-can-link.sh is very long and new usages > are about to be added. > > Add a helper variable to make the code easier to read and maintain. > > Signed-off-by: Thomas Weißschuh <[email protected]>
Reviewed-by: Nathan Chancellor <[email protected]> > --- > init/Kconfig | 4 ++-- > scripts/Kconfig.include | 3 +++ > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/init/Kconfig b/init/Kconfig > index > cab3ad28ca49e7ac930207c9cde8d431d55dc7af..7b722e714d5c5a0580467914b226dc0700ec0797 > 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -84,8 +84,8 @@ config RUSTC_LLVM_VERSION > > config CC_CAN_LINK > bool > - default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) > $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(m64-flag)) if 64BIT > - default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) > $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(m32-flag)) > + default $(cc_can_link_user,$(m64-flag)) if 64BIT > + default $(cc_can_link_user,$(m32-flag)) > > # Fixed in GCC 14, 13.3, 12.4 and 11.5 > # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=113921 > diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include > index > 33193ca6e8030e659d6b321acaea1acd42c387a4..d42042b6c9e243b46d1626d892c0c986621ce462 > 100644 > --- a/scripts/Kconfig.include > +++ b/scripts/Kconfig.include > @@ -65,6 +65,9 @@ cc-option-bit = $(if-success,$(CC) -Werror $(1) -E -x c > /dev/null -o /dev/null,$ > m32-flag := $(cc-option-bit,-m32) > m64-flag := $(cc-option-bit,-m64) > > +# Test whether the compiler can link userspace applications > +cc_can_link_user = $(success,$(srctree)/scripts/cc-can-link.sh $(CC) > $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(1)) > + > rustc-version := $(shell,$(srctree)/scripts/rustc-version.sh $(RUSTC)) > rustc-llvm-version := $(shell,$(srctree)/scripts/rustc-llvm-version.sh > $(RUSTC)) > > > -- > 2.51.0 >
