[tor-commits] [orbot/master] Fix building of openssl on newer systems

[n8fr8 at torproject.org]

commit 57ef1c3f612e62300a41f2e241be6540f312a67d
Author: Daniel Martí <mvdan at mvdan.cc>
Date:   Tue Mar 25 19:44:54 2014 +0100

    Fix building of openssl on newer systems
    
    Forcing CC when running make works around this problem.
    
    Signed-off-by: Nathan Freitas <nathan at freitas.net>
---
 external/Makefile |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 93d279d..bce8d83 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