summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-27 10:23:15 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-27 14:27:25 +0100
commit79302211cc171d5b7c443448434b8565efa1d2c8 (patch)
treea8a42a9366a843ed455a0ca751625234caa34f70 /Configure
parent800fe8e339f0926b0ddda9cd1959c19bd17dc65b (diff)
downloadopenssl-new-79302211cc171d5b7c443448434b8565efa1d2c8.tar.gz
Apply default after having checked the given config target is valid
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure5
1 files changed, 4 insertions, 1 deletions
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)/);