Skip to content

Commit

Permalink
build.info: add the Perl wrapper to build generator programs on Windows
Browse files Browse the repository at this point in the history
Pull request openssl#14320 introduced the ability to use compiled programs
as generators in GENERATE rules of build.info files. Those generator
calls were wrapped by the Perl wrapper (wrap.pl) in the Unix makefile
template, but not on Windows.

This commit adds the missing wrapper for Windows, because for the
`fipsmodule.cnf` target it is essential that the `openssl fipsinstall`
command does not load any preinstalled openssl configuration file.

Fixes openssl#13680

Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#13684)
  • Loading branch information
mspncp committed Apr 29, 2021
1 parent 18da9fc commit d9ce268
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Configurations/windows-makefile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -789,8 +789,8 @@ EOF
# Also redo $gen0, to ensure that we have the proper extension.
$gen0 = platform->bin($gen0);
return <<"EOF";
$args{src}: $gen0 $deps
$gen0$gen_args > \$@
$args{src}: $gen0 $deps "\$(BLDDIR)\\util\\wrap.pl"
"\$(PERL)" "\$(BLDDIR)\\util\\wrap.pl" $gen0$gen_args > \$@
EOF
} else {
#
Expand Down

0 comments on commit d9ce268

Please sign in to comment.