Fixes to CROSS_COMPILE, don't override command line option from environment

diff --git a/Configure b/Configure
index d46361e4d1e4dfcda5449144c6ff8e561aebc000..9489bc3742f95fe2cbc5cbec419d8bef35d06969 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1047,7 +1047,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 =~ /.\/$/;

diff --git a/Makefile.org b/Makefile.org
index e28efa82a2d1bfa60ce898e73dc4d7214aa67f82..8836b6ef45bf29645b7fa112093a0f09e528cefc 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -180,7 +180,7 @@ BUILDENV=   PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
                CC='$(CC)' CFLAG='$(CFLAG)'                     \
                AS='$(CC)' ASFLAG='$(CFLAG) -c'                 \
                AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'        \
-               CROSS_COMPILE_PREFIX='$(CROSS_COMPILE_PREFIX)'  \
+               CROSS_COMPILE='$(CROSS_COMPILE)'        \
                PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'             \
                SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'     \
                INSTALL_PREFIX='$(INSTALL_PREFIX)'              \
@@ -394,7 +394,7 @@ dclean:
 
 rehash: rehash.time
 rehash.time: certs apps
-       @if [ -z "$(CROSS_COMPILE_PREFIX)" ]; then \
+       @if [ -z "$(CROSS_COMPILE)" ]; then \
                (OPENSSL="`pwd`/util/opensslwrap.sh"; \
                [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
                OPENSSL_DEBUG_MEMORY=on; \

diff --git a/Makefile.shared b/Makefile.shared
index e1e214a2a4fc47f1e31038526044cde104fcfb94..3569832f1b92151dfe63ffadf096751830cf031e 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -281,7 +281,7 @@ link_a.cygwin:
        fi; \
        dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
        $(PERL) util/mkrc.pl $$dll_name | \
-               $(CROSS_COMPILE_PREFIX)windres -o rc.o; \
+               $(CROSS_COMPILE)windres -o rc.o; \
        extras="$$extras rc.o"; \
        ALLSYMSFLAGS='-Wl,--whole-archive'; \
        NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \