summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Ware <zach@python.org>2023-04-24 18:31:43 (GMT)
committerGitHub <noreply@github.com>2023-04-24 18:31:43 (GMT)
commited948e01bb68e3f026f38a7e43241d850ee1bfb5 (patch)
treeb1a01b1a390c3a6450c7105c3eee5d9ac1df1d4a
parent6751a4af9512d4a6d65b5eedd60ff9923c519ad2 (diff)
downloadcpython-ed948e01bb68e3f026f38a7e43241d850ee1bfb5.zip
cpython-ed948e01bb68e3f026f38a7e43241d850ee1bfb5.tar.gz
cpython-ed948e01bb68e3f026f38a7e43241d850ee1bfb5.tar.bz2
gh-103776: Remove explicit uses of $(SHELL) from Makefile (GH-103778)
This avoids conflicting with the shebang of the called scripts as well as avoiding hard errors on platforms where the called script runs a failing unchecked command in the usual course of checking since `SHELL=/bin/sh -e` as of a90863c. Fixes gh-103776.
-rw-r--r--Makefile.pre.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 5823108..b3eb002 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -982,7 +982,7 @@ Makefile Modules/config.c: Makefile.pre \
Modules/Setup.local \
Modules/Setup.bootstrap \
Modules/Setup.stdlib
- $(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
+ $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
-s Modules \
Modules/Setup.local \
Modules/Setup.stdlib \
@@ -2423,12 +2423,12 @@ frameworkinstallextras:
# Build the toplevel Makefile
Makefile.pre: $(srcdir)/Makefile.pre.in config.status
- CONFIG_FILES=Makefile.pre CONFIG_HEADERS= $(SHELL) config.status
+ CONFIG_FILES=Makefile.pre CONFIG_HEADERS= ./config.status
$(MAKE) -f Makefile.pre Makefile
# Run the configure script.
config.status: $(srcdir)/configure
- $(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
+ $(srcdir)/configure $(CONFIG_ARGS)
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
@@ -2453,8 +2453,8 @@ reindent:
# Rerun configure with the same options as it was run last time,
# provided the config.status script exists
recheck:
- $(SHELL) config.status --recheck
- $(SHELL) config.status
+ ./config.status --recheck
+ ./config.status
# Regenerate configure and pyconfig.h.in
.PHONY: autoconf