diff options
| author | jperkin <jperkin@pkgsrc.org> | 2020-06-25 08:45:00 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2020-06-25 08:45:00 +0000 |
| commit | 45425b212f10b96922751c52a9f2de4af6944efa (patch) | |
| tree | 85c33773fe8f5ca8792fe8784def7198e145ab04 /mk | |
| parent | f2b56adfba2ac26925e09f76035f8e38af019ada (diff) | |
| download | pkgsrc-45425b212f10b96922751c52a9f2de4af6944efa.tar.gz | |
mk: Handle pdksh issue with "set -e" in for loop.
With our current version of pdksh, a "false && something" construct under
"set -e" conditions will continue as it does with other shells, but if the
construct is within a for loop then it exits, causing failures in the
substitution code. An explicit "|| true" is necessary to avoid this.
Approved during the freeze by wiz.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/subst.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/subst.mk b/mk/subst.mk index e30bcae06ce..39fbaec55b0 100644 --- a/mk/subst.mk +++ b/mk/subst.mk @@ -1,4 +1,4 @@ -# $NetBSD: subst.mk,v 1.100 2020/06/16 18:13:54 rillig Exp $ +# $NetBSD: subst.mk,v 1.101 2020/06/25 08:45:00 jperkin Exp $ # # The subst framework replaces text in one or more files in the WRKSRC # directory. Packages can define several ``classes'' of replacements. @@ -221,7 +221,7 @@ ${_SUBST_COOKIE.${class}}: noop_count="$$noop_count+"; \ noop_patterns="$$noop_patterns$$noop_sep$$pattern"; \ noop_sep=" "; \ - }; \ + } || ${TRUE}; \ done; \ \ case $$noop_count in \ |