mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-103776: Remove explicit uses of $(SHELL) from Makefile (GH-103778)

Browse source 
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.
This commit is contained in:
Zachary Ware 2023-04-24 13:31:43 -05:00 • committed by GitHub
parent 6751a4af95
commit ed948e01bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile.pre.in
View file

@ -982,7 +982,7 @@ Makefile Modules/config.c: Makefile.pre \
Modules/Setup.local \ Modules/Setup.local \
Modules/Setup.bootstrap \ Modules/Setup.bootstrap \
Modules/Setup.stdlib Modules/Setup.stdlib
$(SHELL) $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \ $(MAKESETUP) -c $(srcdir)/Modules/config.c.in \
-s Modules \ -s Modules \
Modules/Setup.local \ Modules/Setup.local \
Modules/Setup.stdlib \ Modules/Setup.stdlib \
@ -2423,12 +2423,12 @@ frameworkinstallextras:
# Build the toplevel Makefile # Build the toplevel Makefile
Makefile.pre: $(srcdir)/Makefile.pre.in config.status 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 $(MAKE) -f Makefile.pre Makefile
# Run the configure script. # Run the configure script.
config.status: $(srcdir)/configure config.status: $(srcdir)/configure
$(SHELL) $(srcdir)/configure $(CONFIG_ARGS) $(srcdir)/configure $(CONFIG_ARGS)
.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre .PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre
@ -2453,8 +2453,8 @@ reindent:
# Rerun configure with the same options as it was run last time, # Rerun configure with the same options as it was run last time,
# provided the config.status script exists # provided the config.status script exists
recheck: recheck:
$(SHELL) config.status --recheck ./config.status --recheck
$(SHELL) config.status ./config.status
# Regenerate configure and pyconfig.h.in # Regenerate configure and pyconfig.h.in
.PHONY: autoconf .PHONY: autoconf