]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
build.info: add the Perl wrapper to build generator programs on Windows
authorDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>
Wed, 14 Apr 2021 18:23:43 +0000 (20:23 +0200)
committerDr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com>
Thu, 29 Apr 2021 09:26:58 +0000 (11:26 +0200)
Pull request #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 #13680

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13684)

Configurations/windows-makefile.tmpl

index c6d63651cbd04c7f1b3b0f249242b240edc42162..4843106de2be93ca9b73b8f2afe8eaaff1fd1108 100644 (file)
@@ -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 {
           #