diff options
author | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-14 20:23:43 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <matthias.st.pierre@ncp-e.com> | 2021-04-29 11:26:58 +0200 |
commit | d9ce268151e5d3de4f15673aa8c0ae60b07eeadd (patch) | |
tree | 35d686bc052e3d66d8a6ea67a4c0a8dec78e9441 | |
parent | 18da9fc31f050edaf65da162f01c7bea920a5aac (diff) | |
download | openssl-new-d9ce268151e5d3de4f15673aa8c0ae60b07eeadd.tar.gz |
build.info: add the Perl wrapper to build generator programs on Windows
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)
-rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index c6d63651cb..4843106de2 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -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 { # |