openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Configure: don't mangle the directory again when checking DEPEND inclusion 

When generating the correct inclusion directory for DEPEND, we mangled
it to be relative to the build or the source directory.  However, the
value we handle already come with a correct directory, so we only need
to use it as is.

Fixes #5543

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5546)
This commit is contained in:
Richard Levitte 2018-03-07 15:58:04 +01:00
parent 4917e91160
commit 906032d5a0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Configure
View File

@ -2135,16 +2135,12 @@ EOF
next if $dest eq "";
foreach my $d (keys %{$unified_info{depends}->{$dest}}) {
next unless $d =~ /\.(h|pm)$/;
if ($d eq "configdata.pm"
|| defined($unified_info{generate}->{$d})) {
my $i = cleandir($blddir, dirname($d));
push @{$unified_info{includes}->{$dest}->{build}}, $i
unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{build}};
} else {
my $i = cleandir($srcdir, dirname($d));
push @{$unified_info{includes}->{$dest}->{source}}, $i
unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{source}};
}
my $i = dirname($d);
my $spot =
$d eq "configdata.pm" || defined($unified_info{generate}->{$d})
? 'build' : 'source';
push @{$unified_info{includes}->{$dest}->{$spot}}, $i
unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{$spot}};
}
}