diff options
author | Andy Polyakov <appro@openssl.org> | 2015-12-12 12:23:41 +0100 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2015-12-13 20:54:22 +0100 |
commit | 0c14d442545aaea01067308c39d7c644239adc23 (patch) | |
tree | 3e1df7f7c4631b0bb2a628af4acdbb0395f60384 | |
parent | d25aeabca8341d6489cfea2c29b263aa581e3dc7 (diff) | |
download | openssl-0c14d442545aaea01067308c39d7c644239adc23.tar.gz |
Configure: 'reconf' to respect CROSS_COMPILE and CC.
Reviewed-by: Richard Levitte <levitte@openssl.org>
-rwxr-xr-x | Configure | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -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"; } |