From cc330c704d961e51eae561a4dff425965c656914 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 16 Nov 2018 00:28:00 +0100 Subject: [PATCH] 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 Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/7645) --- Configure | 10 ++++++++++ 1 file changed, 10 insertions(+) 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}}) { -- 2.25.1