summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-12-26 09:27:02 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-12-26 09:27:02 -0800
commitf4c1cef73b32255c6b3f3bc4a7f5f6851194f8ff (patch)
tree236e341e9ef3b5f63c4037ed84d3acac1e0f4f1f
parent4346aaa3333eb4ba2bd6ee0dc1976c32545d3bfb (diff)
downloadsubsurface-f4c1cef73b32255c6b3f3bc4a7f5f6851194f8ff.tar.gz
Android build: work around odd bug with cmake 3.10
For some reason it suddenly cannot figure out which build program to use. This seems like a weird hack, but works. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-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 0eecebf47..e4aab2ccc 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -399,6 +399,7 @@ cmake $MOBILE_CMAKE \
-DANDROID_NATIVE_LIBSSL="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libssl.so" \
-DANDROID_NATIVE_LIBCRYPT="$BUILDROOT/ndk-$ARCH/sysroot/usr/lib/libcrypto.so" \
-DBUILDTOOLS_REVISION="$ANDROID_BUILDTOOLS_REVISION" \
+ -DCMAKE_MAKE_PROGRAM="make" \
"$SUBSURFACE_SOURCE"
# set up the version number