[tip: x86/build] x86/build: Use $(CONFIG_SHELL)

From: tip-bot2 for Andrew Morton
Date: Wed May 06 2020 - 03:56:56 EST


The following commit has been merged into the x86/build branch of tip:

Commit-ID: 950a37078aa0ab63a57673e7027e8735e73d4bc6
Gitweb: https://git.kernel.org/tip/950a37078aa0ab63a57673e7027e8735e73d4bc6
Author: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
AuthorDate: Tue, 05 May 2020 14:26:51 -07:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Wed, 06 May 2020 09:46:26 +02:00

x86/build: Use $(CONFIG_SHELL)

When scripts/x86-check-compiler.sh doesn't have the executable bit set:

q:/usr/src/25> make clean
make: execvp: ./scripts/x86-check-compiler.sh: Permission denied

Fix this by using $(CONFIG_SHELL).

This will happen if the user downloads and applies patch-5.7.tar.gz, since
patch(1) doesn't preserve the x bit.

Fixes: 73da86741e7f7 ("x86/build: Check whether the compiler is sane")
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200505211932.GE6880@xxxxxxx
---
arch/x86/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 38d3eec..9e22791 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -2,7 +2,7 @@
# Unified Makefile for i386 and x86_64

# Check the compiler
-sane_compiler := $(shell $(srctree)/scripts/x86-check-compiler.sh $(CC))
+sane_compiler := $($(CONFIG_SHELL) $(srctree)/scripts/x86-check-compiler.sh $(CC))
$(if $(sane_compiler),$(error $(CC) check failed. Aborting),)

# select defconfig based on actual architecture