The branch master has been updated
via 79302211cc171d5b7c443448434b8565efa1d2c8 (commit)
from 800fe8e339f0926b0ddda9cd1959c19bd17dc65b (commit)
- Log -----------------------------------------------------------------
commit 79302211cc171d5b7c443448434b8565efa1d2c8
Author: Richard Levitte <levi...@openssl.org>
Date: Sat Feb 27 10:23:15 2016 +0100
Apply default after having checked the given config target is valid
Reviewed-by: Rich Salz <rs...@openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configure | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Configure b/Configure
index b1985ea..09376c8 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)/);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
