diff options
| author | Randall S. Becker <rsbecker@nexbridge.com> | 2021-03-18 16:45:28 -0600 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-03-29 10:05:33 +0200 |
| commit | 92a979b4034cd6c1da9cc71736929eb4161359d2 (patch) | |
| tree | 563ef1ba8c261985c0b7aa250d73d3cc9a4ce0ce /Configurations | |
| parent | 09a17655ea2d5e64b8bd9fd4b74c7dd5daf45bf4 (diff) | |
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 <rsbecker@nexbridge.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14613)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
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 { # |