summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2021-03-18 05:07:11 +0100
committerRichard Levitte <levitte@openssl.org>2021-03-19 16:44:46 +0100
commit2d101b0f493a3066c5ea7152c00c44d70fcea4d8 (patch)
tree971eaa531c07528a69e26ee89b52ca8818ede8bd /Configure
parent6084b5c2c9ab5a167d808d6f6c9b21f98c99bbc2 (diff)
downloadopenssl-new-2d101b0f493a3066c5ea7152c00c44d70fcea4d8.tar.gz
Configure: check all DEPEND values against GENERATE, not just .h files
All files that are given to DEPEND statements in build.info files are being checked against GENERATE statements, to see if it's reasonable to look for them in the source tree or not. This was only done for .h files, for reasons that are lost in history. We now change that check to look at all files instead. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/14598)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure8
1 files changed, 4 insertions, 4 deletions
diff --git a/Configure b/Configure
index 5f2be9cf3c..10a988e6a3 100755
--- a/Configure
+++ b/Configure
@@ -2349,16 +2349,16 @@ EOF
}
foreach (@{$depends{$dest}}) {
my $d = cleanfile($sourced, $_, $blddir);
+ my $d2 = cleanfile($buildd, $_, $blddir);
# If we know it's generated, or assume it is because we can't
# find it in the source tree, we set file we depend on to be
# in the build tree rather than the source tree.
if ($d eq $src_configdata
- || (grep { $d eq $_ }
- map { cleanfile($srcdir, $_, $blddir) }
- grep { /\.h$/ } keys %{$unified_info{generate}})
+ || (grep { $d2 eq $_ }
+ keys %{$unified_info{generate}})
|| ! -f $d) {
- $d = cleanfile($buildd, $_, $blddir);
+ $d = $d2;
}
$unified_info{depends}->{$ddest}->{$d} = 1;