CROSS_COMPILE: don't override command line option from environment
authorDr. Stephen Henson <steve@openssl.org>
Thu, 15 Oct 2009 23:45:22 +0000 (23:45 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 15 Oct 2009 23:45:22 +0000 (23:45 +0000)
Configure

index 0c00d98aeec6010ef46bdfcd688c5558dbd63f16..5d113ac7f106b543e4f3986bd74fb96f50ca10bc 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1101,7 +1101,7 @@ $default_ranlib= &which("ranlib") or $default_ranlib="true";
 $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
   or $perl="perl";
 
-$cross_compile_prefix=$ENV{'CROSS_COMPILE'};
+$cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq "";
 
 chop $openssldir if $openssldir =~ /\/$/;
 chop $prefix if $prefix =~ /.\/$/;