aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2018-11-24 10:21:07 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-12-30 11:20:34 -0800
commit1429629567c0afdcd3284fbe4973d76add9a8549 (patch)
treedb57efce88f05fbbd0bce94ab4808ff2a732f530 /packaging
parente683eb4880309b35328614e724f7b4fd156b0e81 (diff)
downloadsubsurface-1429629567c0afdcd3284fbe4973d76add9a8549.tar.gz
Android build: always install libzip.a in lib directory
A subtle one. When compiling for arm64, libzip is the only package we use in mobile that installs its product in lib64. There is no reason for this given the way our build process is. So, simply force the library to reside in lib, independent if we are building arm or arm64 architectures. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/android/build.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 9a41a041f..9a2d27ad1 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -245,6 +245,7 @@ if [ "$QUICK" = "" ] ; then
-DCMAKE_C_COMPILER="$CC" \
-DCMAKE_LINKER="$CC" \
-DCMAKE_INSTALL_PREFIX="$PREFIX" \
+ -DCMAKE_INSTALL_LIBDIR="lib" \
-DBUILD_SHARED_LIBS=OFF \
../libzip/
make