]> sigrok.org Git - sigrok-util.git/commitdiff
sigrok-cross-android: Set CMAKE_MAKE_PROGRAM to fix libftdi build.
authorUwe Hermann <redacted>
Fri, 23 Mar 2018 08:24:02 +0000 (09:24 +0100)
committerUwe Hermann <redacted>
Sun, 25 Mar 2018 15:46:37 +0000 (17:46 +0200)
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.

cross-compile/android/sigrok-cross-android

index a4233de92b1ad6692bd6d2bb9d29ba8106d55001..a26f568f0ef0bb5a4d9eacbaec7a7bac7e7ca00a 100755 (executable)
@@ -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