summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-11-16 00:28:00 +0100
committerMatt Caswell <matt@openssl.org>2018-11-19 17:26:03 +0000
commitcc330c704d961e51eae561a4dff425965c656914 (patch)
tree96ac4500d13f442d9fcf9372ef8fdc96fe77d140 /Configure
parent610ea181a85ffafdbebe5a123817becbbfdae30f (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-xConfigure10
1 files changed, 10 insertions, 0 deletions
diff --git a/Configure b/Configure
index b3328928df..d5dc36c285 100755
--- a/Configure
+++ b/Configure
@@ -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}}) {