summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-11-15 21:37:55 +0100
committerRichard Levitte <levitte@openssl.org>2018-11-15 21:37:55 +0100
commit856b1b65fa21439f8247a45ffbd44cee74da19af (patch)
tree6e5e53fc74b3d728ac38b85a04e561298012ffed /Configure
parenttest/siphash_internal_test.c: ensure the SIPHASH structure is zeroed (diff)
downloadopenssl-856b1b65fa21439f8247a45ffbd44cee74da19af.tar.xz
openssl-856b1b65fa21439f8247a45ffbd44cee74da19af.zip
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> (Merged from https://github.com/openssl/openssl/pull/7644)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/Configure b/Configure
index 94e48b4113..cc061dc5e7 100755
--- 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 { @_ };