diff options
author | Richard Levitte <levitte@openssl.org> | 2021-02-25 17:43:57 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-03-03 14:47:01 +0100 |
commit | 79f47ef507c945f4c73bcf8eb12f2caef19dc04e (patch) | |
tree | 3d9c60e10b4040c460ad3d161018dc7e08a1c467 /Configure | |
parent | build.info: Add the possibility to add dependencies on raw targets (diff) | |
download | openssl-79f47ef507c945f4c73bcf8eb12f2caef19dc04e.tar.xz openssl-79f47ef507c945f4c73bcf8eb12f2caef19dc04e.zip |
build.info: Make it possible to use compiled programs as generators
Our goal is to be able to produce fipsmodule.cnf with the help of
'openssl fipsinstall', using the openssl program that we build.
This refactors the generatesrc code in all the build file templates to
replace $generator and $generator_incs with $gen0, $gen_args and $gen_incs,
which makes it easier and more consistent to manipulate different bits
of the generator command, and also keeps the variable names consistent
while not overly long.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14320)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2320,7 +2320,7 @@ EOF $generator[0] = cleanfile($sourced, $gen, $blddir); # If the generator is itself generated, it's in the build tree - if ($generate{$gen}) { + if ($generate{$gen} || ! -f $generator[0]) { $generator[0] = cleanfile($buildd, $gen, $blddir); } $check_generate{$ddest}->{$generator[0]}++; |