sigrok-cross-android: Set CMAKE_MAKE_PROGRAM to fix libftdi build.

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index d490d9a95c26a06be48dc7bac565171cdc08be43..a26f568f0ef0bb5a4d9eacbaec7a7bac7e7ca00a 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -78,7 +78,7 @@ VER_PYTHON=3.3.3
 VER_BOOST=1.58.0
 VER_QT=5.6.0
 VER_QT_SHORT=5.6
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.6
 VER_NDK=10e
 VER_SDK=24.4.1
 VER_AND_BT=23.0.2 # Android build tools version
@@ -191,6 +191,7 @@ else
   CM="$CM -DANDROID_NDK=${ANDROID_NDK}"
   CM="$CM -DANDROID_NATIVE_API_LEVEL=${NATIVE_API_LEVEL}"
   CM="$CM -DANDROID_TOOLCHAIN_NAME=${TOOLCHAIN_TRIPLET}-${NDK_TOOLCHAIN_VERSION}"
+  CM="$CM -DCMAKE_MAKE_PROGRAM=${ANDROID_NDK}/prebuilt/linux-x86/bin/make"
 fi
 
 # Look for STL, needed to build bindings