summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-10-28 14:00:41 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-10-28 14:00:41 +0000
commitd3f940833d4a58b6cfe47603a1fad35aaedd5d92 (patch)
tree572e2844b80553ef38ff11a54f89b56e2e95f58c /Configure
parentb335e351d4f2e5d8ce8f096fad4670528a9bac39 (diff)
PR: 2081
Submitted by: Mike Frysinger <vapier@gentoo.org> Approved by: steve@openssl.org Respect AR and RANLIB environment variables if set.
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure4
1 files changed, 3 insertions, 1 deletions
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";
}