PR: 2081
Submitted by: Mike Frysinger <vapier@gentoo.org> Approved by: steve@openssl.org Respect AR and RANLIB environment variables if set.
This commit is contained in:
@@ -1090,7 +1090,8 @@ my $shared_target = $fields[$idx_shared_target];
|
|||||||
my $shared_cflag = $fields[$idx_shared_cflag];
|
my $shared_cflag = $fields[$idx_shared_cflag];
|
||||||
my $shared_ldflag = $fields[$idx_shared_ldflag];
|
my $shared_ldflag = $fields[$idx_shared_ldflag];
|
||||||
my $shared_extension = $fields[$idx_shared_extension];
|
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 $arflags = $fields[$idx_arflags];
|
||||||
my $multilib = $fields[$idx_multilib];
|
my $multilib = $fields[$idx_multilib];
|
||||||
|
|
||||||
@@ -1499,6 +1500,7 @@ while (<IN>)
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
s/^CC=.*$/CC= $cc/;
|
s/^CC=.*$/CC= $cc/;
|
||||||
|
s/^AR=.*/AR= $ar/;
|
||||||
s/^RANLIB=.*/RANLIB= $ranlib/;
|
s/^RANLIB=.*/RANLIB= $ranlib/;
|
||||||
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
|
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user