From: Richard Levitte <levitte@openssl.org>
Date: Sat, 27 Feb 2016 09:23:15 +0000 (+0100)
Subject: Apply default after having checked the given config target is valid
X-Git-Tag: OpenSSL_1_1_0-pre4~484
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79302211cc171d5b7c443448434b8565efa1d2c8;p=oweals%2Fopenssl.git

Apply default after having checked the given config target is valid

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/Configure b/Configure
index b1985ea691..09376c8358 100755
--- a/Configure
+++ b/Configure
@@ -841,10 +841,13 @@ if ($d) {
 }
 $config{target} = $target;
 delete $table{$base_target}->{template}; # or the next test will fail.
-my %target = ( %{$table{$base_target}}, resolve_config($target) );
+my %target = resolve_config($target);
 
 &usage if (!%target || $target{template});
 
+# Set up defaults
+my %target = ( %{$table{$base_target}}, %target );
+
 $target{exe_extension}="";
 $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"
                                   || $config{target} =~ /^(?:Cygwin|mingw)/);