dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building of openssl on newer systems 

Forcing CC when running make works around this problem.

Signed-off-by: Nathan Freitas <nathan@freitas.net>
This commit is contained in:
Daniel Martí 2014-03-25 19:44:54 +01:00 committed by Nathan Freitas
parent b5a043a6a0
commit 57ef1c3f61
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/Makefile vendored
View File

@ -84,17 +84,15 @@ all: assets
lib/libcrypto.a: lib/libcrypto.a:
cd openssl && \ cd openssl && \
CC="$(CC)" \
./Configure android -DL_ENDIAN && \ ./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: lib/libssl.a:
cp config.sub openssl cp config.sub openssl
cp config.guess openssl cp config.guess openssl
cd openssl && \ cd openssl && \
CC="$(CC)"\
./Configure android -DL_ENDIAN && \ ./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 openssl-build-stamp: lib/libcrypto.a lib/libssl.a
touch openssl-build-stamp touch openssl-build-stamp