summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-11-13 13:33:00 +0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-11-13 15:51:17 +0800
commita58cd3eb1395f87ecfe396f6ff42952a56aef257 (patch)
tree4d70d09411a7ceb8e3f0660760031e913392a838 /packaging
parent1868bd38b6958d4bccefd64759b63e360ae6524a (diff)
downloadsubsurface-a58cd3eb1395f87ecfe396f6ff42952a56aef257.tar.gz
Android: explicitly build with gcc
Our Android build currently fails with clang. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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 25cdbdd48..c32dbc87d 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -398,6 +398,7 @@ cmake $MOBILE_CMAKE \
-DPKG_CONFIG_EXECUTABLE="$PKGCONF" \
-DQT_ANDROID_SDK_ROOT="$ANDROID_SDK_ROOT" \
-DQT_ANDROID_NDK_ROOT="$ANDROID_NDK_ROOT" \
+ -DANDROID_TOOLCHAIN="gcc" \
-DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_ROOT"/build/cmake/android.toolchain.cmake \
-DQT_ANDROID_CMAKE="$BUILDROOT"/qt-android-cmake/AddQtAndroidApk.cmake \
-DFORCE_LIBSSH=OFF \