diff options
author | Richard Levitte <levitte@openssl.org> | 2018-01-27 12:13:35 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-01-28 07:26:11 +0100 |
commit | 085ed4f15a8a5eb9ac7fd1151f7a3308d4372c04 (patch) | |
tree | b299bd58d25d4e479e6e3678d24291adcf955842 /Configure | |
parent | 5b18235a186dd28ec7a37ed95e29f4ab61f2bcbe (diff) |
Stop having Unix defaults in Configure (partial)
Default values belong in the DEFAULT config target template, in
Configurations/00-base-templates.conf.
This isn't a complete move, but takes care of the most blatant
examples.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 12 |
1 files changed, 0 insertions, 12 deletions
@@ -576,16 +576,6 @@ my %user_to_target = ( LDFLAGS => 'lflags', LDLIBS => 'ex_libs', ); -my %user_defaults = ( - AR => 'ar', - ARFLAGS => [ 'r' ], - CC => 'cc', - CXX => 'c++', - HASHBANGPERL=> '/usr/bin/env perl', # Only Unix actually cares - RANLIB => sub { which("$config{cross_compile_prefix}ranlib") ? - "\$(CROSS_COMPILE)ranlib" : "true"; }, - RC => 'windres', - ); $config{openssl_api_defines}=[]; $config{openssl_algorithm_defines}=[]; @@ -1158,8 +1148,6 @@ foreach (keys %user) { $config{$target_key} = $mkvalue->($ref_type, $user{$_}) || $mkvalue->($ref_type, $target{$target_key}); - $config{$target_key} ||=$mkvalue->($ref_type, $user_defaults{$_}) - if exists $user_defaults{$_}; if (defined $useradd{$_} && @{$useradd{$_}}) { if (defined $config{$target_key}) { push @{$config{$target_key}}, @{$useradd{$_}}; |