summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-15 18:08:54 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-15 23:13:08 +0100
commit51cf8e0b50f677581bff2694942b690bbff630b7 (patch)
tree7fef49c04a2293f06fbbd35d38fb9021e9be1d62 /Configure
parent6475b64978083750018db90c60f4df142aa2e28f (diff)
Configure: move down the treatment of seed sources
Most of all, this is so it doesn't output mysterious text when we're treating the phony config targets LISH, HASH and TABLE Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5383)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure22
1 files changed, 11 insertions, 11 deletions
diff --git a/Configure b/Configure
index cfe3625b7a..9835cf0663 100755
--- a/Configure
+++ b/Configure
@@ -886,17 +886,6 @@ if (grep { $_ =~ /(^|\s)-Wl,-rpath,/ } ($user{LDLIBS} ? @{$user{LDLIBS}} : ())
"***** any of asan, msan or ubsan\n";
}
-if (scalar(@seed_sources) == 0) {
- print "Using implicit seed configuration\n";
- push @seed_sources, 'os';
-}
-die "Cannot seed with none and anything else"
- if scalar(grep { $_ eq 'none' } @seed_sources) > 0
- && scalar(@seed_sources) > 1;
-push @{$config{openssl_other_defines}},
- map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" }
- @seed_sources;
-
my @tocheckfor = (keys %disabled);
while (@tocheckfor) {
my %new_tocheckfor = ();
@@ -940,6 +929,17 @@ if ($target eq "HASH") {
print "Configuring OpenSSL version $config{version} ($config{version_num}) ";
print "for $target\n";
+if (scalar(@seed_sources) == 0) {
+ print "Using os-specific seed configuration\n";
+ push @seed_sources, 'os';
+}
+die "Cannot seed with none and anything else"
+ if scalar(grep { $_ eq 'none' } @seed_sources) > 0
+ && scalar(@seed_sources) > 1;
+push @{$config{openssl_other_defines}},
+ map { (my $x = $_) =~ tr|[\-a-z]|[_A-Z]|; "OPENSSL_RAND_SEED_$x" }
+ @seed_sources;
+
# Backward compatibility?
if ($target =~ m/^CygWin32(-.*)$/) {
$target = "Cygwin".$1;