The branch master has been updated
via 0c14d442545aaea01067308c39d7c644239adc23 (commit)
from d25aeabca8341d6489cfea2c29b263aa581e3dc7 (commit)
- Log -----------------------------------------------------------------
commit 0c14d442545aaea01067308c39d7c644239adc23
Author: Andy Polyakov <[email protected]>
Date: Sat Dec 12 12:23:41 2015 +0100
Configure: 'reconf' to respect CROSS_COMPILE and CC.
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configure | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/Configure b/Configure
index 913773b..b6672a0 100755
--- a/Configure
+++ b/Configure
@@ -1032,6 +1032,7 @@ PROCESS_ARGS:
{
if (open(IN,"<$Makefile"))
{
+ my $config_args_found=0;
while (<IN>)
{
chomp;
@@ -1043,11 +1044,19 @@ PROCESS_ARGS:
if
(grep(/^reconf/,@argvcopy));
print "Reconfiguring with:
$argvstring\n";
$argv_unprocessed=1;
- close(IN);
- last PROCESS_ARGS;
+ $config_args_found=1;
+ }
+ elsif (/^CROSS_COMPILE=\s*(.*)/)
+ {
+ $ENV{CROSS_COMPILE}=$1;
+ }
+ elsif
(/^CC=\s*(?:\$\(CROSS_COMPILE\))?(.*?)/)
+ {
+ $ENV{CC}=$1;
}
}
close(IN);
+ last PROCESS_ARGS if ($config_args_found);
}
die "Insufficient data to reconfigure, please do a
normal configuration\n";
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
