aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2018-11-24 10:52:22 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-12-30 11:20:34 -0800
commit37476b34aa6d6b11f22f7014699479ee58b5caf2 (patch)
tree34ea306d64a37a50701052bf658222b4ca883fa4
parent2e5df6eda7d3e8b91a355efb952d417fa6bf9596 (diff)
downloadsubsurface-37476b34aa6d6b11f22f7014699479ee58b5caf2.tar.gz
Android build: fix openssl build, no_asm
Mysteriously, openssl does not compile with clang with a sha256-armv4.S:2638:2: error: invalid instruction, did you mean: adr? The easiest way out is compiling without no_asm. This obviously lowers the bandwidth on the SSL link (as the asm code is there for performance reasons), but it has no visible performance loss in my tests. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
-rwxr-xr-xpackaging/android/build.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 86729de38..09f2af8ad 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -272,7 +272,7 @@ if [ "$QUICK" = "" ] ; then
HOSTCC=clang \
CC=clang \
ANDROID_DEV="$PREFIX" \
- bash -x ./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir="$PREFIX"
+ bash -x ./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine no-asm --openssldir="$PREFIX"
# sed -i.bak -e 's/soname=\$\$SHLIB\$\$SHLIB_SOVER\$\$SHLIB_SUFFIX/soname=\$\$SHLIB/g' Makefile.shared
make depend
make