We need Unixly defaults for config targets that don't inherit a BASE
Ideally, each config target should inherit a base to get their platform specific defaults. Unfortunately, that is currently not the case, so we duplicate the Unixly defaults from the BASE_unix template into the DEFAULT template. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5177)
This commit is contained in:
parent
085ed4f15a
commit
36f7be2c2f
1 changed files with 15 additions and 3 deletions
|
@ -38,10 +38,22 @@ my %targets=(
|
||||||
shared_rcflag => "",
|
shared_rcflag => "",
|
||||||
shared_extension => "",
|
shared_extension => "",
|
||||||
|
|
||||||
hashbangperl => "PERL", # Only Unix actually cares
|
#### Defaults for the benefit of the config targets who don't inherit
|
||||||
|
#### a BASE and assume Unixly defaults
|
||||||
|
#### THESE WILL DISAPPEAR IN OpenSSL 1.2
|
||||||
|
build_scheme => [ "unified", "unix" ],
|
||||||
|
build_file => "Makefile",
|
||||||
|
|
||||||
build_scheme => [ "unified", "unix" ],
|
ar => "ar",
|
||||||
build_file => "Makefile",
|
arflags => "r",
|
||||||
|
cc => "cc",
|
||||||
|
hashbangperl => "/usr/bin/env perl",
|
||||||
|
ranlib => sub { which("$config{cross_compile_prefix}ranlib") ?
|
||||||
|
"\$(CROSS_COMPILE)ranlib" : "true"; },
|
||||||
|
rc => "windres",
|
||||||
|
|
||||||
|
#### THESE WILL BE ENABLED IN OpenSSL 1.2
|
||||||
|
#hashbangperl => "PERL", # Only Unix actually cares
|
||||||
},
|
},
|
||||||
|
|
||||||
BASE_common => {
|
BASE_common => {
|
||||||
|
|
Loading…
Reference in a new issue