提交 36f7be2c 编写于 作者: R Richard Levitte

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: NTim Hudson <tjh@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
上级 085ed4f1
...@@ -38,10 +38,22 @@ my %targets=( ...@@ -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 => {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册