gh-100220: Fix error handling in make rules (GH-100328) · python/cpython@a90863c · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 74.9k

• Code
• Issues 5k+
• Pull requests 2.5k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a90863c

Browse filesBrowse the repository at this point in the historyBrowse files

mgorny

and

zware

authored

gh-100220: Fix error handling in make rules (GH-100328)

Set `SHELL = /bin/sh -e` to ensure that complex recipes fail on the first error rather than incorrectly reporting success. Co-authored-by: Zachary Ware <zach@python.org>

1 parent 2667452 commit a90863c
Copy full SHA for a90863c

2 files changed

+5-1Lines changed: 5 additions & 1 deletion

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Makefile.pre.in
• Misc/NEWS.d/next/Build
  • 2022-12-18-07-24-44.gh-issue-100220.BgSV7C.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Makefile.pre.in‎

Copy file name to clipboardExpand all lines: Makefile.pre.in

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -59,7 +59,7 @@ DSYMUTIL_PATH= @DSYMUTIL_PATH@
59	59	GNULD= @GNULD@
60	60
61	61	# Shell used by make (some versions default to the login shell, which is bad)
62		- SHELL= /bin/sh
	62	+ SHELL= /bin/sh -e
63	63
64	64	# Use this to make a link between python$(VERSION) and python in $(BINDIR)
65	65	LN= @LN@

Collapse file

‎Misc/NEWS.d/next/Build/2022-12-18-07-24-44.gh-issue-100220.BgSV7C.rst‎

Copy file name to clipboard

+4Lines changed: 4 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,4 @@
	1	+ Changed the default value of the ``SHELL`` Makefile variable from ``/bin/sh``
	2	+ to ``/bin/sh -e`` to ensure that complex recipes correctly fail after an error.
	3	+ Previously, ``make install`` could fail to install some files and yet return
	4	+ a successful result.

0 commit comments

Comments

0 (0)