[tor-dev] [Orbot patch] Fix building of openssl on newer systems

[Daniel Martí]

This is probably due to newer auto-tools having slightly different
configuration options. On a recent setup, the following occured:

make[2]: arm-eabi-/opt/android-ndk/[...]/arm-linux-androideabi-gcc: Command not found

It was, for some reason, making CC be arm-eabi- plus the path to the NDK.

Forcing CC when running make works around this problem.
---
 external/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 875fa90..0310bb2 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -84,17 +84,15 @@ all: assets
 
 lib/libcrypto.a:
 	cd openssl && \
-		CC="$(CC)" \
 		./Configure android -DL_ENDIAN && \
-		ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs
+		make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr build_libs
 
 lib/libssl.a:
 	cp config.sub openssl
 	cp config.guess openssl
 	cd openssl && \
-		CC="$(CC)"\
 		./Configure android -DL_ENDIAN && \
-		ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs
+		make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr build_libs
 
 openssl-build-stamp: lib/libcrypto.a lib/libssl.a
 	touch openssl-build-stamp

-- 
Daniel Martí - mvdan at mvdan.cc - http://mvdan.cc/
PGP: A9DA 13CD F7A1 4ACD D3DE  E530 F4CA FFDB 4348 041C
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.torproject.org/pipermail/tor-dev/attachments/20140325/575aeeab/attachment.sig>