提交 5f2e18bc 编写于 作者: R Richard Levitte

Refactor the ranlib attribute

It was inconsistent to see this specific command have
'$(CROSS_COMPILE)' in its value when no other command did.
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5247)
上级 d5fa7035
...@@ -50,8 +50,8 @@ my %targets=( ...@@ -50,8 +50,8 @@ my %targets=(
arflags => "r", arflags => "r",
cc => "cc", cc => "cc",
hashbangperl => "/usr/bin/env perl", hashbangperl => "/usr/bin/env perl",
ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? ranlib => sub { which("$config{cross_compile_prefix}ranlib")
"\$(CROSS_COMPILE)ranlib" : "true"; }, ? "ranlib" : "" },
rc => "windres", rc => "windres",
#### THESE WILL BE ENABLED IN OpenSSL 1.2 #### THESE WILL BE ENABLED IN OpenSSL 1.2
...@@ -94,8 +94,8 @@ my %targets=( ...@@ -94,8 +94,8 @@ my %targets=(
&& defined($disabled{"zlib-dynamic"}) && defined($disabled{"zlib-dynamic"})
? "-lz" : () }, ? "-lz" : () },
hashbangperl => "/usr/bin/env perl", # Only Unix actually cares hashbangperl => "/usr/bin/env perl", # Only Unix actually cares
ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? ranlib => sub { which("$config{cross_compile_prefix}ranlib")
"\$(CROSS_COMPILE)ranlib" : "true"; }, ? "ranlib" : "" },
rc => "windres", rc => "windres",
build_scheme => [ "unified", "unix" ], build_scheme => [ "unified", "unix" ],
......
...@@ -218,7 +218,7 @@ PERL={- $config{perl} -} ...@@ -218,7 +218,7 @@ PERL={- $config{perl} -}
AR=$(CROSS_COMPILE){- $config{ar} -} AR=$(CROSS_COMPILE){- $config{ar} -}
ARFLAGS= {- join(' ', @{$config{arflags}}) -} ARFLAGS= {- join(' ', @{$config{arflags}}) -}
RANLIB= {- $config{ranlib} -} RANLIB={- $config{ranlib} ? "\$(CROSS_COMPILE)$config{ranlib}" : "true"; -}
RC= $(CROSS_COMPILE){- $target{rc} || "windres" -} RC= $(CROSS_COMPILE){- $target{rc} || "windres" -}
RCFLAGS={- join(' ', @{$config{rcflags}}) -} {- $target{shared_rcflag} -} RCFLAGS={- join(' ', @{$config{rcflags}}) -} {- $target{shared_rcflag} -}
RM= rm -f RM= rm -f
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册