Commit 5f2e18bc authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5247)
parent d5fa7035

Configurations/00-base-templates.conf

+4 −4
Original line number Diff line number Diff line
@@ -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" ],

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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