diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 23:43:54 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 23:43:54 +0000 |
| commit | 3477592385788232332b4df86f4bfc1ef75600b3 (patch) | |
| tree | 90b0e9cc39ed68e874dff26393adf62971adf8d4 | |
| parent | be45636661e73c952029ccef82f15ceed16f1acf (diff) | |
Fixes to CROSS_COMPILE, don't override command line option from environment
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | Makefile.org | 4 | ||||
| -rw-r--r-- | Makefile.shared | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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 20a5c4cab5..0018b60a6b 100644 --- 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 e1e214a2a4..3569832f1b 100644 --- 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'; \ |