From: Uwe Hermann <redacted>
Date: Fri, 23 Mar 2018 08:24:02 +0000 (+0100)
Subject: sigrok-cross-android: Set CMAKE_MAKE_PROGRAM to fix libftdi build.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f54556e78d7ccd183adb27da4b262d34c05b0819;p=sigrok-util.git

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

The libftdi build was failing (for quite a while now) like this:

  CMake Error: CMake was unable to find a build program corresponding
  to "Unix Makefiles".  CMAKE_MAKE_PROGRAM is not set.  You probably need
  to select a different build tool.

Explicitly setting CMAKE_MAKE_PROGRAM seems to fix this.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index a4233de..a26f568 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -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