diff options
author | Richard Levitte <levitte@openssl.org> | 2018-11-16 00:28:00 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2018-11-19 17:26:03 +0000 |
commit | cc330c704d961e51eae561a4dff425965c656914 (patch) | |
tree | 96ac4500d13f442d9fcf9372ef8fdc96fe77d140 /Configure | |
parent | 610ea181a85ffafdbebe5a123817becbbfdae30f (diff) |
Configuration: only include shared_sources in dirinfo in shared config
Without this precaution, we end up having directory targets depend on
shlib object files for which there are no rules.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7645)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -2179,6 +2179,16 @@ EOF # Massage the result + # If the user configured no-shared, we allow no shared sources + if ($disabled{shared}) { + foreach (keys %{$unified_info{shared_sources}}) { + foreach (keys %{$unified_info{shared_sources}->{$_}}) { + delete $unified_info{sources}->{$_}; + } + } + $unified_info{shared_sources} = {}; + } + # If we depend on a header file or a perl module, add an inclusion of # its directory to allow smoothe inclusion foreach my $dest (keys %{$unified_info{depends}}) { |