Commit 34775923 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

parent be456366

Configure

+1 −1
Original line number Diff line number Diff line
@@ -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 =~ /.\/$/;

Makefile.org

+2 −2
Original line number Diff line number Diff line
@@ -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; \

Makefile.shared

+1 −1
Original line number Diff line number Diff line
@@ -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'; \