Skip to content

Commit ed948e0

Browse files
authored
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.
1 parent 6751a4a commit ed948e0

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile.pre.in

+5-5
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ Makefile Modules/config.c: Makefile.pre \
982982
Modules/Setup.local \
983983
Modules/Setup.bootstrap \
984984
Modules/Setup.stdlib
985-
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
985+
$(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
986986
-s Modules \
987987
Modules/Setup.local \
988988
Modules/Setup.stdlib \
@@ -2423,12 +2423,12 @@ frameworkinstallextras:
24232423

24242424
# Build the toplevel Makefile
24252425
Makefile.pre: $(srcdir)/Makefile.pre.in config.status
2426-
CONFIG_FILES=Makefile.pre CONFIG_HEADERS= $(SHELL) config.status
2426+
CONFIG_FILES=Makefile.pre CONFIG_HEADERS= ./config.status
24272427
$(MAKE) -f Makefile.pre Makefile
24282428

24292429
# Run the configure script.
24302430
config.status: $(srcdir)/configure
2431-
$(SHELL) $(srcdir)/configure $(CONFIG_ARGS)
2431+
$(srcdir)/configure $(CONFIG_ARGS)
24322432

24332433
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
24342434

@@ -2453,8 +2453,8 @@ reindent:
24532453
# Rerun configure with the same options as it was run last time,
24542454
# provided the config.status script exists
24552455
recheck:
2456-
$(SHELL) config.status --recheck
2457-
$(SHELL) config.status
2456+
./config.status --recheck
2457+
./config.status
24582458

24592459
# Regenerate configure and pyconfig.h.in
24602460
.PHONY: autoconf

0 commit comments

Comments
 (0)