diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 23:44:11 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-10-15 23:44:11 +0000 |
commit | 9b1f24df3d2b18b679b2bc22284f34e88488c4ed (patch) | |
tree | 7fad884bf03c7bb636d10eca2e36f85e79f7b280 /Makefile.org | |
parent | 595e804ae39ac4a4e5b923320f8203e29838b0d3 (diff) |
Fixes to CROSS_COMPILE, don't override command line option from environment
Diffstat (limited to 'Makefile.org')
-rw-r--r-- | Makefile.org | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index e28efa82a2..8836b6ef45 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; \ |