Configuration: only include shared_sources in dirinfo in shared config
authorRichard Levitte <levitte@openssl.org>
Thu, 15 Nov 2018 20:37:55 +0000 (21:37 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 15 Nov 2018 20:37:55 +0000 (21:37 +0100)
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>
(Merged from https://github.com/openssl/openssl/pull/7644)

Configure

index 94e48b41139e6854716605eb024ac01531ba31bc..cc061dc5e71f55edbaec5fbd349d3e6b6fe1a806 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -2249,6 +2249,9 @@ EOF
                                            dst => 'sources' } }
                } -> {$prodtype};
             foreach my $kind (keys %$intent) {
+                next if ($intent->{$kind}->{dst} eq 'shared_sources'
+                             && $disabled{shared});
+
                 my @src = @{$intent->{$kind}->{src}};
                 my $dst = $intent->{$kind}->{dst};
                 my $prodselect = $intent->{$kind}->{prodselect} // sub { @_ };