Apply default after having checked the given config target is valid

[openssl.git] / Configure

diff --git a/Configure b/Configure
index b1985ea691fdfad9de7dde8b5a2fcf39849a085d..09376c835811cd868d4e455fba9a457f3090621a 100755 (executable)
--- 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)/);