The branch master has been updated via 92a979b4034cd6c1da9cc71736929eb4161359d2 (commit) from 09a17655ea2d5e64b8bd9fd4b74c7dd5daf45bf4 (commit)
- Log ----------------------------------------------------------------- commit 92a979b4034cd6c1da9cc71736929eb4161359d2 Author: Randall S. Becker <rsbec...@nexbridge.com> Date: Thu Mar 18 16:45:28 2021 -0600 Add $(PERL) to util/wrap.pl execution to avoid env incompatibilities Using /usr/bin/env on the NonStop ia64 and x86 platforms causes a translation of - to -i as part of the implicit interpretation by env of its arguments prior to handing off the arguments to perl. This causes the FIPS module configuration to be written to a file named -i instead of going to stdout. CLA: Trivial Fixes: #14612 Signed-off-by: Randall S. Becker <rsbec...@nexbridge.com> Reviewed-by: Tomas Mraz <to...@openssl.org> Reviewed-by: Richard Levitte <levi...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14613) ----------------------------------------------------------------------- Summary of changes: Configurations/unix-Makefile.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 249652296c..d0192aa32e 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1433,9 +1433,10 @@ EOF # Also redo $gen0, to ensure that we have the proper extension where # necessary. $gen0 = platform->bin($gen0); + # Use $(PERL) to execute wrap.pl directly to avoid calling env return <<"EOF"; $args{src}: $gen0 $deps \$(BLDDIR)/util/wrap.pl - \$(BLDDIR)/util/wrap.pl $gen0$gen_args > \$@ + \$(PERL) \$(BLDDIR)/util/wrap.pl $gen0$gen_args > \$@ EOF } else { #