From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 28 Oct 2009 14:00:41 +0000 (+0000)
Subject: PR: 2081
X-Git-Tag: OpenSSL_1_0_0-beta4~23
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d3f940833d4a58b6cfe47603a1fad35aaedd5d92;p=oweals%2Fopenssl.git

PR: 2081
Submitted by: Mike Frysinger <vapier@gentoo.org>
Approved by: steve@openssl.org

Respect AR and RANLIB environment variables if set.
---

diff --git a/Configure b/Configure
index d433d9ee8c..6799735274 100755
--- a/Configure
+++ b/Configure
@@ -1090,7 +1090,8 @@ my $shared_target = $fields[$idx_shared_target];
 my $shared_cflag = $fields[$idx_shared_cflag];
 my $shared_ldflag = $fields[$idx_shared_ldflag];
 my $shared_extension = $fields[$idx_shared_extension];
-my $ranlib = $fields[$idx_ranlib];
+my $ranlib = $ENV{'RANLIB'} || $fields[$idx_ranlib];
+my $ar = $ENV{'AR'} || "ar";
 my $arflags = $fields[$idx_arflags];
 my $multilib = $fields[$idx_multilib];
 
@@ -1499,6 +1500,7 @@ while (<IN>)
 		}
 	else	{
 		s/^CC=.*$/CC= $cc/;
+		s/^AR=.*/AR= $ar/;
 		s/^RANLIB=.*/RANLIB= $ranlib/;
 		s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
 		}