The branch OpenSSL_1_1_1-stable has been updated
via cc330c704d961e51eae561a4dff425965c656914 (commit)
from 610ea181a85ffafdbebe5a123817becbbfdae30f (commit)
- Log -----------------------------------------------------------------
commit cc330c704d961e51eae561a4dff425965c656914
Author: Richard Levitte <[email protected]>
Date: Fri Nov 16 00:28:00 2018 +0100
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 <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/7645)
-----------------------------------------------------------------------
Summary of changes:
Configure | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Configure b/Configure
index b332892..d5dc36c 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}}) {
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
