]> granicus.if.org Git - openssl/commitdiff
PR: 2081
authorDr. Stephen Henson <steve@openssl.org>
Wed, 28 Oct 2009 14:00:41 +0000 (14:00 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 28 Oct 2009 14:00:41 +0000 (14:00 +0000)
Submitted by: Mike Frysinger <vapier@gentoo.org>
Approved by: steve@openssl.org

Respect AR and RANLIB environment variables if set.

Configure

index d433d9ee8c3d96a84bc4b9b036ca32e7aa8b0722..6799735274c687a6a26f5c35522f971b1ac7ffc4 100755 (executable)
--- 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";
                }