diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-02-02 12:23:09 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-02-22 14:57:21 +0100 |
| commit | 5f2e18bc3e8a85fe4ea2d0c892b7399c797c7cd0 (patch) | |
| tree | 0a711de6090c6e3f15861dedfd515218d2423651 /Configurations | |
| parent | d5fa7035cbe7f7f4cb6d69a3b7f8680fde5008f0 (diff) | |
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: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5247)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 8 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 99c271e5b1..0350997ff7 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -50,8 +50,8 @@ my %targets=( arflags => "r", cc => "cc", hashbangperl => "/usr/bin/env perl", - ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? - "\$(CROSS_COMPILE)ranlib" : "true"; }, + ranlib => sub { which("$config{cross_compile_prefix}ranlib") + ? "ranlib" : "" }, rc => "windres", #### THESE WILL BE ENABLED IN OpenSSL 1.2 @@ -94,8 +94,8 @@ my %targets=( && defined($disabled{"zlib-dynamic"}) ? "-lz" : () }, hashbangperl => "/usr/bin/env perl", # Only Unix actually cares - ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? - "\$(CROSS_COMPILE)ranlib" : "true"; }, + ranlib => sub { which("$config{cross_compile_prefix}ranlib") + ? "ranlib" : "" }, rc => "windres", build_scheme => [ "unified", "unix" ], diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 1f214a2747..2a4d2df332 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -218,7 +218,7 @@ PERL={- $config{perl} -} AR=$(CROSS_COMPILE){- $config{ar} -} ARFLAGS= {- join(' ', @{$config{arflags}}) -} -RANLIB= {- $config{ranlib} -} +RANLIB={- $config{ranlib} ? "\$(CROSS_COMPILE)$config{ranlib}" : "true"; -} RC= $(CROSS_COMPILE){- $target{rc} || "windres" -} RCFLAGS={- join(' ', @{$config{rcflags}}) -} {- $target{shared_rcflag} -} RM= rm -f |