提交 0c594ccc 编写于 作者: R Richard Levitte

Configuration: make sure the shared_sources table doesn't contain empty elements

Fixes #7634
Reviewed-by: NViktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7635)
上级 45f24725
...@@ -2203,8 +2203,8 @@ EOF ...@@ -2203,8 +2203,8 @@ EOF
next unless defined($unified_info{includes}->{$dest}->{$k}); next unless defined($unified_info{includes}->{$dest}->{$k});
my @incs = reverse @{$unified_info{includes}->{$dest}->{$k}}; my @incs = reverse @{$unified_info{includes}->{$dest}->{$k}};
foreach my $obj (grep /\.o$/, foreach my $obj (grep /\.o$/,
(keys %{$unified_info{sources}->{$dest}}, (keys %{$unified_info{sources}->{$dest} // {}},
keys %{$unified_info{shared_sources}->{$dest}})) { keys %{$unified_info{shared_sources}->{$dest} // {}})) {
foreach my $inc (@incs) { foreach my $inc (@incs) {
unshift @{$unified_info{includes}->{$obj}->{$k}}, $inc unshift @{$unified_info{includes}->{$obj}->{$k}}, $inc
unless grep { $_ eq $inc } @{$unified_info{includes}->{$obj}->{$k}}; unless grep { $_ eq $inc } @{$unified_info{includes}->{$obj}->{$k}};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册