Commit cc330c70 authored by Richard Levitte's avatar Richard Levitte Committed by Matt Caswell
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarMatthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7645)
parent 610ea181
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -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}}) {